Skip to content

Commit

Permalink
Update EventStreamTransformationService to use EventStreamManager for…
Browse files Browse the repository at this point in the history
… cloning and clearing streams.
  • Loading branch information
MartinYSpasov committed May 9, 2018
1 parent 2d18d1f commit dd94295
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import uk.gov.justice.services.core.enveloper.Enveloper;
import uk.gov.justice.services.eventsourcing.source.core.EventSource;
import uk.gov.justice.services.eventsourcing.source.core.EventStream;
import uk.gov.justice.services.eventsourcing.source.core.EventStreamManager;
import uk.gov.justice.services.eventsourcing.source.core.exception.EventStreamException;
import uk.gov.justice.services.messaging.JsonEnvelope;
import uk.gov.justice.tools.eventsourcing.transformation.api.EventTransformation;
Expand Down Expand Up @@ -34,6 +35,9 @@ public class EventStreamTransformationService {
@Inject
Logger logger;

@Inject
EventStreamManager eventStreamManager;

@Inject
EventSource eventSource;

Expand Down Expand Up @@ -64,7 +68,7 @@ public UUID transformEventStream(final UUID streamId) throws EventStreamExceptio

if (requiresTransformation(eventStream)) {
try {
final UUID clonedStreamId = eventSource.cloneStream(streamId);
final UUID clonedStreamId = eventStreamManager.cloneAsAncestor(streamId);

if (logger.isDebugEnabled()) {
logger.debug(format("Cloned stream '%s' from stream '%s'", clonedStreamId, streamId));
Expand All @@ -73,7 +77,7 @@ public UUID transformEventStream(final UUID streamId) throws EventStreamExceptio
final EventStream stream = eventSource.getStreamById(streamId);
final Stream<JsonEnvelope> events = stream.read();

eventSource.clearStream(streamId);
eventStreamManager.clear(streamId);

logger.info("transforming events on stream {}", streamId);
final Stream<JsonEnvelope> transformedEventStream = transform(events);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import uk.gov.justice.services.core.enveloper.Enveloper;
import uk.gov.justice.services.eventsourcing.source.core.EventSource;
import uk.gov.justice.services.eventsourcing.source.core.EventStream;
import uk.gov.justice.services.eventsourcing.source.core.EventStreamManager;
import uk.gov.justice.services.eventsourcing.source.core.exception.EventStreamException;
import uk.gov.justice.services.messaging.JsonEnvelope;
import uk.gov.justice.services.messaging.spi.DefaultJsonEnvelopeProvider;
Expand Down Expand Up @@ -61,6 +62,9 @@ public class EventStreamTransformationServiceTest {
@Mock
private Logger logger;

@Mock
private EventStreamManager eventStreamManager;

@InjectMocks
private EventStreamTransformationService service;

Expand Down Expand Up @@ -90,8 +94,8 @@ public void shouldTransformStreamOfSingleEvent() throws EventStreamException {

service.transformEventStream(STREAM_ID);

verify(eventSource).cloneStream(STREAM_ID);
verify(eventSource).clearStream(STREAM_ID);
verify(eventStreamManager).cloneAsAncestor(STREAM_ID);
verify(eventStreamManager).clear(STREAM_ID);
verify(eventStream).append(streamCaptor.capture());
verify(eventStream).append(any());
}
Expand All @@ -106,7 +110,7 @@ public void shouldOnlyTransformOneEventOnStream() throws EventStreamException {

service.transformEventStream(STREAM_ID);

verify(eventSource).clearStream(STREAM_ID);
verify(eventStreamManager).clear(STREAM_ID);
verify(eventStream).append(any());
}

Expand Down

0 comments on commit dd94295

Please sign in to comment.