Merge 35485f7 into 769eb3c

CJSCommonPlatform · Aug 30, 2018 · 30588bf · 30588bf
2 parents 769eb3c + 35485f7
commit 30588bf
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 12 deletions.
diff --git a/event-tool/pom.xml b/event-tool/pom.xml
@@ -64,11 +64,6 @@
             <artifactId>bean-validation</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.wildfly.swarm</groupId>
             <artifactId>jaxrs</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
     <properties>
         <cpp.repo.name>stream-transformation-tool</cpp.repo.name>
 
-        <framework.version>3.0.0</framework.version>
+        <framework.version>4.3.2</framework.version>
         <common-bom.version>1.22.0</common-bom.version>
         <utilities.version>1.11.0</utilities.version>
         <test-utils.version>1.16.0</test-utils.version>

diff --git a/...tice/tools/eventsourcing/transformation/service/EventStreamTransformationServiceTest.java b/...tice/tools/eventsourcing/transformation/service/EventStreamTransformationServiceTest.java
@@ -16,7 +16,8 @@
 import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;
-import static uk.gov.justice.services.messaging.spi.DefaultJsonMetadata.metadataBuilder;
+import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom;
+import static uk.gov.justice.services.messaging.JsonEnvelope.metadataBuilder;
 import static uk.gov.justice.tools.eventsourcing.transformation.api.Action.ARCHIVE;
 import static uk.gov.justice.tools.eventsourcing.transformation.api.Action.DEACTIVATE;
 import static uk.gov.justice.tools.eventsourcing.transformation.api.Action.NO_ACTION;
@@ -28,7 +29,6 @@
 import uk.gov.justice.services.eventsourcing.source.core.EventStream;
 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;
 import uk.gov.justice.tools.eventsourcing.transformation.api.Action;
 import uk.gov.justice.tools.eventsourcing.transformation.api.EventTransformation;
 import uk.gov.justice.tools.eventsourcing.transformation.api.annotation.Transformation;
@@ -252,7 +252,7 @@ public void shouldPerformAllTheIndicatedActionsOnAStream() throws EventStreamExc
     }
 
     private JsonEnvelope buildEnvelope(final String eventName) {
-        return DefaultJsonEnvelopeProvider.provider().envelopeFrom(
+        return envelopeFrom(
                 metadataBuilder().withId(randomUUID()).withStreamId(STREAM_ID).withName(eventName),
                 createObjectBuilder().add("field", "value").build());
     }

diff --git a/...java/uk/gov/justice/tools/eventsourcing/transformation/service/StreamTransformerTest.java b/...java/uk/gov/justice/tools/eventsourcing/transformation/service/StreamTransformerTest.java
@@ -9,7 +9,8 @@
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static uk.gov.justice.services.messaging.spi.DefaultJsonMetadata.metadataBuilder;
+import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom;
+import static uk.gov.justice.services.messaging.JsonEnvelope.metadataBuilder;
 import static uk.gov.justice.services.test.utils.core.enveloper.EnveloperFactory.createEnveloper;
 import static uk.gov.justice.tools.eventsourcing.transformation.api.Action.NO_ACTION;
 import static uk.gov.justice.tools.eventsourcing.transformation.api.Action.TRANSFORM;
@@ -19,7 +20,6 @@
 import uk.gov.justice.services.eventsourcing.source.core.EventStream;
 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;
 import uk.gov.justice.tools.eventsourcing.transformation.api.EventTransformation;
 
 import java.util.Optional;
@@ -142,7 +142,7 @@ public void shouldNotTransformEventWhichHasNotBeenIndicatedFor() throws EventStr
     }
 
     private JsonEnvelope buildEnvelope(final String eventName) {
-        return DefaultJsonEnvelopeProvider.provider().envelopeFrom(
+        return envelopeFrom(
                 metadataBuilder().withId(randomUUID()).withStreamId(STREAM_ID).withName(eventName),
                 createObjectBuilder().add("field", "value").build());
     }