update to eventstore 0.6.2

Author: vanrogu

pom.xml

@@ -34,7 +34,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-		<sliceworkz.eventstore.version>0.6.0</sliceworkz.eventstore.version>
+		<sliceworkz.eventstore.version>0.6.2</sliceworkz.eventstore.version>
 
 		<maven.minimal-version>3.6.3</maven.minimal-version>
 

sliceworkz-eventmodeling-impl/src/main/java/org/sliceworkz/eventmodeling/module/aggregates/AggregateEventAppenderImpl.java

@@ -29,7 +29,7 @@
 import org.sliceworkz.eventstore.events.Event;
 import org.sliceworkz.eventstore.events.EventReference;
 import org.sliceworkz.eventstore.events.Tags;
-import org.sliceworkz.eventstore.query.EventQuery;
+import org.sliceworkz.eventstore.query.EventFilter;
 import org.sliceworkz.eventstore.query.EventTypesFilter;
 import org.sliceworkz.eventstore.stream.AppendCriteria;
 import org.sliceworkz.eventstore.stream.EventStream;
@@ -89,7 +89,7 @@ public EventReference append() {
 		}
 
 		EventReference lastEvent = eventStream.append(
-				AppendCriteria.of(EventQuery.forEvents(EventTypesFilter.any(), identity), lastReference),
+				AppendCriteria.of(EventFilter.forEvents(EventTypesFilter.any(), identity), lastReference),
 				events).stream().map(e->{this.lastReference=e.reference();return e;}).map(e->{aggregate.when(e);return e;}).map(Event::reference).reduce((one,two)->two).orElse(null);
 		events.clear();
 		return lastEvent;

sliceworkz-eventmodeling-impl/src/main/java/org/sliceworkz/eventmodeling/module/dcb/CommandResultImpl.java

@@ -26,26 +26,26 @@
 import org.sliceworkz.eventstore.events.Event;
 import org.sliceworkz.eventstore.events.EventReference;
 import org.sliceworkz.eventstore.events.Tags;
-import org.sliceworkz.eventstore.query.EventQuery;
+import org.sliceworkz.eventstore.query.EventFilter;
 import org.sliceworkz.eventstore.stream.AppendCriteria;
 import org.sliceworkz.eventstore.stream.EventStreamId;
 
-public record CommandResultImpl<DOMAIN_EVENT_TYPE, PRODUCED_EVENT_TYPE> ( String boundedContext, EventStreamId targetStreamId, Tracing tracing, EventQuery eventQuery, EventReference lastEventReference, List<EphemeralEvent<? extends PRODUCED_EVENT_TYPE>> events ) 
+public record CommandResultImpl<DOMAIN_EVENT_TYPE, PRODUCED_EVENT_TYPE> ( String boundedContext, EventStreamId targetStreamId, Tracing tracing, EventFilter eventFilter, EventReference lastEventReference, List<EphemeralEvent<? extends PRODUCED_EVENT_TYPE>> events )
 implements CommandResult<DOMAIN_EVENT_TYPE, PRODUCED_EVENT_TYPE> {
 
 	// TODO add monitoring & debugging metadata? (models used, events seen, timings, correlation id, actor / acting user, channel, ...)
-	
-	public CommandResultImpl ( String boundedContext, EventStreamId targetStreamId, Tracing tracing, EventQuery eventQuery, EventReference lastEventReference, List<EphemeralEvent<? extends PRODUCED_EVENT_TYPE>> events ) {
+
+	public CommandResultImpl ( String boundedContext, EventStreamId targetStreamId, Tracing tracing, EventFilter eventFilter, EventReference lastEventReference, List<EphemeralEvent<? extends PRODUCED_EVENT_TYPE>> events ) {
 		this.boundedContext = boundedContext;
 		this.targetStreamId = targetStreamId;
 		this.tracing = tracing;
-		this.eventQuery = eventQuery;
+		this.eventFilter = eventFilter;
 		this.lastEventReference = lastEventReference;
 		this.events = events;
 	}
 
-	public CommandResultImpl ( String boundedContext, EventStreamId targetStreamId, Tracing tracing, EventQuery eventQuery, EventReference lastEventReference ) {
-		this(boundedContext, targetStreamId, tracing, eventQuery, lastEventReference, new ArrayList<>());
+	public CommandResultImpl ( String boundedContext, EventStreamId targetStreamId, Tracing tracing, EventFilter eventFilter, EventReference lastEventReference ) {
+		this(boundedContext, targetStreamId, tracing, eventFilter, lastEventReference, new ArrayList<>());
 	}
 
 	@Override
@@ -64,7 +64,7 @@ public List<EphemeralEvent<? extends PRODUCED_EVENT_TYPE>> raisedEvents ( ) {
 	}
 
 	public AppendCriteria appendCriteria ( ) {
-		return AppendCriteria.of(eventQuery, lastEventReference); 
+		return AppendCriteria.of(eventFilter, lastEventReference); 
 	}
 
 }

sliceworkz-eventmodeling-impl/src/main/java/org/sliceworkz/eventmodeling/module/dcb/DCBCommandContextImpl.java

@@ -118,9 +118,7 @@ public EventQuery eventQuery() {
 			lastEventReference = projectorMetrics.lastEventReference();
 		}
 
-		// TODO needs forLockingCheck() -> FORWARD !   
-		
-		return new CommandResultImpl<>(boundedContext, targetEventStream.id(), tracing, combinedQuery.forLockingCheck(), lastEventReference);
+		return new CommandResultImpl<>(boundedContext, targetEventStream.id(), tracing, combinedQuery.filter(), lastEventReference);
 	}
 
 	private Event<? extends CONSUMED_EVENT_TYPE> offerEventToDecisionModels ( Event<CONSUMED_EVENT_TYPE> e, List<DecisionModel<CONSUMED_EVENT_TYPE>> decisionModels ) {