Use framework 7

CJSCommonPlatform · May 22, 2020 · 3b2e4e4 · 3b2e4e4
1 parent 3445d95
commit 3b2e4e4
Show file tree

Hide file tree

Showing 16 changed files with 48 additions and 200 deletions.
diff --git a/example-context/example-persistence/pom.xml b/example-context/example-persistence/pom.xml
@@ -20,7 +20,6 @@
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>persistence-deltaspike</artifactId>
-            <version>${framework.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.utils</groupId>
@@ -51,13 +50,11 @@
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>test-utils-common</artifactId>
-            <version>${framework.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>test-utils-persistence</artifactId>
-            <version>${event-store.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -67,14 +64,13 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.everit.json</groupId>
+            <groupId>com.github.everit-org.json-schema</groupId>
             <artifactId>org.everit.json.schema</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.schema</groupId>
             <artifactId>schema-service</artifactId>
-            <version>${json-schema-catalog.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/example-context/example-service/example-command/example-command-api/pom.xml b/example-context/example-service/example-command/example-command-api/pom.xml
@@ -29,22 +29,18 @@
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>common</artifactId>
-            <version>${framework.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>core</artifactId>
-            <version>${framework.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.framework-generators</groupId>
             <artifactId>rest-adapter-file-service</artifactId>
-            <version>${framework-generators.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.utils</groupId>
             <artifactId>utilities-file</artifactId>
-            <version>${utilities.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
@@ -53,12 +49,10 @@
         <dependency>
             <groupId>uk.gov.justice.framework-generators</groupId>
             <artifactId>rest-adapter-core</artifactId>
-            <version>${framework-generators.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.framework-generators</groupId>
             <artifactId>rest-client-core</artifactId>
-            <version>${framework-generators.version}</version>
         </dependency>
 
         <!-- Test Dependencies -->
@@ -75,7 +69,6 @@
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>test-utils-core</artifactId>
-            <version>${framework.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -87,7 +80,6 @@
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>test-utils-enveloper-provider</artifactId>
-            <version>${framework.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -97,7 +89,7 @@
             <plugin>
                 <groupId>uk.gov.justice.framework-generators</groupId>
                 <artifactId>messaging-client-generator-plugin</artifactId>
-                <version>${framework-generators.version}</version>
+                <version>${framework.version}</version>
                 <executions>
                     <execution>
                         <id>external-ramls</id>
@@ -130,7 +122,7 @@
                     <dependency>
                         <groupId>uk.gov.justice.framework-generators</groupId>
                         <artifactId>messaging-client-generator</artifactId>
-                        <version>${framework-generators.version}</version>
+                        <version>${framework.version}</version>
                     </dependency>
                 </dependencies>
             </plugin>

diff --git a/example-context/example-service/example-command/example-command-handler/pom.xml b/example-context/example-service/example-command/example-command-handler/pom.xml
@@ -37,12 +37,10 @@
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>aggregate-snapshot-service</artifactId>
-            <version>${event-store.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>command-handler-interceptors</artifactId>
-            <version>${event-store.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.services.example</groupId>
@@ -52,37 +50,30 @@
         <dependency>
             <groupId>uk.gov.justice.framework-generators</groupId>
             <artifactId>messaging-adapter-core</artifactId>
-            <version>${framework-generators.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.framework-generators</groupId>
             <artifactId>rest-client-core</artifactId>
-            <version>${framework-generators.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>event-source</artifactId>
-            <version>${event-store.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>event-publisher-jms</artifactId>
-            <version>${event-store.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>event-repository-jdbc</artifactId>
-            <version>${event-store.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>aggregate</artifactId>
-            <version>${framework.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>event-store-management-core</artifactId>
-            <version>${event-store.version}</version>
         </dependency>
 
         <!-- Test Dependencies -->
@@ -100,7 +91,6 @@
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>test-utils-enveloper-provider</artifactId>
-            <version>${framework.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/example-context/example-service/example-custom/example-custom-api/pom.xml b/example-context/example-service/example-custom/example-custom-api/pom.xml
@@ -24,27 +24,22 @@
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>common</artifactId>
-            <version>${framework.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>core</artifactId>
-            <version>${framework.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.schema</groupId>
             <artifactId>schema-service</artifactId>
-            <version>${json-schema-catalog.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.framework-generators</groupId>
             <artifactId>rest-adapter-core</artifactId>
-            <version>${framework-generators.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.framework-generators</groupId>
             <artifactId>rest-client-core</artifactId>
-            <version>${framework-generators.version}</version>
         </dependency>
         <dependency>
             <groupId>javax</groupId>
@@ -75,7 +70,6 @@
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>test-utils-core</artifactId>
-            <version>${framework.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -87,7 +81,6 @@
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>test-utils-enveloper-provider</artifactId>
-            <version>${framework.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/example-context/example-service/example-event/example-event-indexer/pom.xml b/example-context/example-service/example-event/example-event-indexer/pom.xml
@@ -35,22 +35,18 @@
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>common</artifactId>
-            <version>${framework.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>core</artifactId>
-            <version>${framework.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.framework-generators</groupId>
             <artifactId>messaging-adapter-core</artifactId>
-            <version>${framework-generators.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.framework-generators</groupId>
             <artifactId>unifiedsearch-client-generator</artifactId>
-            <version>${framework-generators.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>joda-time</groupId>
@@ -61,22 +57,18 @@
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>subscription-manager</artifactId>
-            <version>${event-store.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>event-subscription-registry</artifactId>
-            <version>${event-store.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>subscription-event-interceptors</artifactId>
-            <version>${event-store.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.framework-api</groupId>
             <artifactId>framework-api-event-listener-interceptors</artifactId>
-            <version>${framework-api.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.ejb3</groupId>
@@ -96,13 +88,11 @@
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>event-buffer-core</artifactId>
-            <version>${event-store.version}</version>
         </dependency>
 
         <dependency>
             <groupId>uk.gov.justice.json</groupId>
             <artifactId>json-transformer-jolt</artifactId>
-            <version>${json-transformer.version}</version>
         </dependency>
 
         <!-- Test Dependencies -->
@@ -119,7 +109,6 @@
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>test-utils-core</artifactId>
-            <version>${framework.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/...c/main/java/uk/gov/justice/services/example/cakeshop/dummy/DummyUnifiedSearchIndexer.java b/...c/main/java/uk/gov/justice/services/example/cakeshop/dummy/DummyUnifiedSearchIndexer.java
@@ -4,6 +4,7 @@
 
 import uk.gov.justice.services.example.cakeshop.persistence.IndexRepository;
 import uk.gov.justice.services.example.cakeshop.persistence.entity.Index;
+import uk.gov.justice.services.messaging.Envelope;
 import uk.gov.justice.services.unifiedsearch.UnifiedSearchIndexer;
 
 import java.time.ZonedDateTime;
@@ -20,9 +21,10 @@ public class DummyUnifiedSearchIndexer implements UnifiedSearchIndexer {
     private IndexRepository indexRepository;
 
     @Override
-    public void indexData(final JsonObject jsonObject) {
-        final UUID recipeId = fromString(jsonObject.getString("recipeId"));
-        final ZonedDateTime deliveryDate = ZonedDateTime.parse(jsonObject.getString("deliveryDate"));
+    public void indexData(final Envelope<JsonObject> eventWithJoltTransformedPayload) {
+        final JsonObject payload = eventWithJoltTransformedPayload.payload();
+        final UUID recipeId = fromString(payload.getString("recipeId"));
+        final ZonedDateTime deliveryDate = ZonedDateTime.parse(payload.getString("deliveryDate"));
         final Index index = new Index(recipeId, deliveryDate);
         indexRepository.save(index);
     }

diff --git a/example-context/example-service/example-event/example-event-listener/pom.xml b/example-context/example-service/example-event/example-event-listener/pom.xml
@@ -29,37 +29,30 @@
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>common</artifactId>
-            <version>${framework.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>core</artifactId>
-            <version>${framework.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.framework-generators</groupId>
             <artifactId>messaging-adapter-core</artifactId>
-            <version>${framework-generators.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>subscription-manager</artifactId>
-            <version>${event-store.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>event-subscription-registry</artifactId>
-            <version>${event-store.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>subscription-event-interceptors</artifactId>
-            <version>${event-store.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.framework-api</groupId>
             <artifactId>framework-api-event-listener-interceptors</artifactId>
-            <version>${framework-api.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.ejb3</groupId>
@@ -79,7 +72,6 @@
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>event-buffer-core</artifactId>
-            <version>${event-store.version}</version>
         </dependency>
 
         <!-- Test Dependencies -->
@@ -96,7 +88,6 @@
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>test-utils-core</artifactId>
-            <version>${framework.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/example-context/example-service/example-event/example-event-processor/pom.xml b/example-context/example-service/example-event/example-event-processor/pom.xml
@@ -28,32 +28,26 @@
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>common</artifactId>
-            <version>${framework.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>core</artifactId>
-            <version>${framework.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.framework-generators</groupId>
             <artifactId>messaging-adapter-core</artifactId>
-            <version>${framework-generators.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>subscription-manager</artifactId>
-            <version>${event-store.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>event-subscription-registry</artifactId>
-            <version>${event-store.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.framework-generators</groupId>
             <artifactId>rest-client-core</artifactId>
-            <version>${framework-generators.version}</version>
         </dependency>
 
         <!-- Test Dependencies -->