Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Fix] Searches should search on items in cache as well 

But then ignore the item from the ElementMap stream
This commit is contained in:
Robert von Burg 2024-02-06 08:00:44 +01:00
parent e33950b7a1
commit 69d1f77364
Signed by: eitch
GPG Key ID: 75DB9C85C74331F7
3 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
agent/src/main/java/li/strolch/search/ActivitySearch.java
View File

@ -1,11 +1,13 @@
package li.strolch.search;
import static li.strolch.model.StrolchModelConstants.PolicyConstants.PARAM_ORDER;
import li.strolch.model.Order;
import li.strolch.model.activity.Activity;
import li.strolch.persistence.api.StrolchTransaction;
import java.util.stream.Stream;
import static li.strolch.model.StrolchModelConstants.PolicyConstants.PARAM_ORDER;
/**
* Performs a search for {@link Activity} elements
*/
@ -20,7 +22,13 @@ public class ActivitySearch extends StrolchSearch<Activity> {
@Override
public ActivitySearch types(String... types) {
this.navigator = tx -> tx.streamActivities(types);
this.navigator = tx -> {
Stream<Activity> cachedStream = tx.streamCachedActivities(types);
Stream<Activity> stream = tx
.streamActivities(types)
.filter(e -> !tx.isActivityCached(e.getType(), e.getId()));
return Stream.concat(cachedStream, stream);
};
return this;
}

7
agent/src/main/java/li/strolch/search/OrderSearch.java
View File

@ -6,6 +6,7 @@ import li.strolch.persistence.api.StrolchTransaction;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Stream;
import static java.util.stream.Collectors.toList;
@ -23,7 +24,11 @@ public class OrderSearch extends StrolchSearch<Order> {
@Override
public OrderSearch types(String... types) {
this.navigator = tx -> tx.streamOrders(types);
this.navigator = tx -> {
Stream<Order> cachedStream = tx.streamCachedOrders(types);
Stream<Order> stream = tx.streamOrders(types).filter(e -> !tx.isOrderCached(e.getType(), e.getId()));
return Stream.concat(cachedStream, stream);
};
return this;
}

10
agent/src/main/java/li/strolch/search/ResourceSearch.java
View File

@ -3,6 +3,8 @@ package li.strolch.search;
import li.strolch.model.Resource;
import li.strolch.persistence.api.StrolchTransaction;
import java.util.stream.Stream;
/**
* Performs a search for {@link Resource} elements
*/
@ -17,7 +19,13 @@ public class ResourceSearch extends StrolchSearch<Resource> {
@Override
public ResourceSearch types(String... types) {
this.navigator = tx -> tx.streamResources(types);
this.navigator = tx -> {
Stream<Resource> cachedStream = tx.streamCachedResources(types);
Stream<Resource> stream = tx
.streamResources(types)
.filter(e -> !tx.isResourceCached(e.getType(), e.getId()));
return Stream.concat(cachedStream, stream);
};
return this;
}