Merge 8a1dc90 into 2a54f71

CJSCommonPlatform · Aug 19, 2019 · 698f013 · 698f013
2 parents 2a54f71 + 8a1dc90
commit 698f013
Show file tree

Hide file tree

Showing 15 changed files with 178 additions and 93 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,17 +5,20 @@ on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to
 
 ## [Unreleased]
 
+## [2.0.0] - 2019-08-19
 ### Added
-- Unifiedsearch indexer module
+- Update to framework 6.0.6
+- Unified Search indexer module
 - Integration test for event catchup
 - Integration test for PublishedEvent rebuild.
-- Update to framework 6.0.0 release candidates
+- Update to event-store 2.0.6
+- Update to framework-generators 2.0.4
 - Update framework-api to 4.0.1
-- Update file.service to 1.17.10
-- Update common-bom to 2.4.0
-- Update utilities to 1.20.1
+- Update file.service to 1.17.11
+- Update common-bom to 2.4.1
+- Update utilities to 1.20.2
 - Update test-utils to 1.24.3
-- Update json-schema-catalog to 1.7.3
+- Update json-schema-catalog to 1.7.4
 
 ### Changed
 - Use a single event-source.yaml in example-event-source module

diff --git a/example-context/example-service/example-event-source/src/yaml/event-sources.yaml b/example-context/example-service/example-event-source/src/yaml/event-sources.yaml
@@ -1,7 +1,11 @@
 event_sources:
-- name: event.source
-  is_default: true
-  location:
-    jms_uri:  jms:topic:example.event
-    rest_uri: http://localhost:8080/example/event-source-api/rest
-    data_source: java:/app/example-single/DS.eventstore
+  - name: event.source
+    is_default: true
+    location:
+      jms_uri:  jms:topic:example.event
+      rest_uri: http://localhost:8080/example/event-source-api/rest
+      data_source: java:/app/example-single/DS.eventstore
+
+  - name: public.event.source
+    location:
+      jms_uri:  jms:topic:public.event
diff --git a/...ontext/example-service/example-event/example-event-processor/src/raml/json/cake-made.json b/...ontext/example-service/example-event/example-event-processor/src/raml/json/cake-made.json
diff --git a/...ext/example-service/example-event/example-event-processor/src/raml/json/recipe-added.json b/...ext/example-service/example-event/example-event-processor/src/raml/json/recipe-added.json
diff --git a/...xample-service/example-event/example-event-processor/src/raml/public-event.messaging.raml b/...xample-service/example-event/example-event-processor/src/raml/public-event.messaging.raml
diff --git a/...json/schema/example.events.cake-made.json → ...json/schema/example.events.cake-made.json b/...json/schema/example.events.cake-made.json → ...json/schema/example.events.cake-made.json
diff --git a/...n/schema/example.events.recipe-added.json → ...n/schema/example.events.recipe-added.json b/...n/schema/example.events.recipe-added.json → ...n/schema/example.events.recipe-added.json
diff --git a/...rvice/example-event/example-event-processor/src/yaml/public-subscriptions-descriptor.yaml b/...rvice/example-event/example-event-processor/src/yaml/public-subscriptions-descriptor.yaml
@@ -0,0 +1,14 @@
+subscriptions_descriptor:
+  spec_version: 1.0.0
+  service: example
+  service_component: EVENT_PROCESSOR
+  subscriptions:
+    - name: public event processor subscription
+      events:
+        - name: example.events.recipe-added
+          schema_uri: http://justice.gov.uk/example/event/example.events.recipe-added.json
+
+        - name: example.events.cake-made
+          schema_uri: http://justice.gov.uk/example/event/example.events.cake-made.json
+
+      event_source_name: public.event.source
diff --git a/example-context/example-service/example-event/pom.xml b/example-context/example-service/example-event/pom.xml
@@ -145,9 +145,9 @@
                     </plugin>
 
                     <plugin>
-                        <artifactId>generator-plugin</artifactId>
-                        <groupId>uk.gov.justice.maven.generator</groupId>
-                        <version>${generator-maven-plugin.version}</version>
+                        <groupId>uk.gov.justice.schema</groupId>
+                        <artifactId>catalog-generation-plugin</artifactId>
+                        <version>${json-schema-catalog.version}</version>
                         <executions>
                             <execution>
                                 <id>schema-catalog-generation</id>
@@ -174,22 +174,36 @@
                                     </generatorProperties>
                                 </configuration>
                                 <goals>
-                                    <goal>generate</goal>
+                                    <goal>generate-schema-catalog</goal>
                                 </goals>
                                 <phase>generate-sources</phase>
                             </execution>
-                            <execution>
-                                <id>generate-messaging-adapters</id>
+                        </executions>
+                        <dependencies>
+                            <dependency>
+                                <groupId>uk.gov.justice.schema</groupId>
+                                <artifactId>catalog-generation</artifactId>
+                                <version>${json-schema-catalog.version}</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                    <plugin>
+                        <groupId>uk.gov.justice.framework-generators</groupId>
+                        <artifactId>messaging-adapter-generator-plugin</artifactId>
+                        <version>${framework-generators.version}</version>
+                        <executions>
+                        <execution>
+                                <id>generate-yaml-messaging-adapters</id>
                                 <goals>
-                                    <goal>generate</goal>
+                                    <goal>generate-messaging-adapter</goal>
                                 </goals>
                                 <phase>generate-sources</phase>
                                 <configuration>
                                     <generatorName>
                                         uk.gov.justice.subscription.jms.core.SubscriptionJmsEndpointGeneratorFactory
                                     </generatorName>
                                     <parserName>
-                                        uk.gov.justice.subscription.jms.parser.SubscriptionWrapperFileParserFactory
+                                        uk.gov.justice.services.generators.subscription.parser.SubscriptionWrapperFileParserFactory
                                     </parserName>
                                     <sourceDirectory>${basedir}/src/yaml</sourceDirectory>
                                     <outputDirectory>${project.build.directory}/generated-sources
@@ -207,28 +221,61 @@
                                 </configuration>
                             </execution>
                         </executions>
+                        <dependencies>
+                            <dependency>
+                                <groupId>uk.gov.justice.framework-generators</groupId>
+                                <artifactId>messaging-adapter-generator</artifactId>
+                                <version>${framework-generators.version}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>uk.gov.justice.services.example</groupId>
+                                <artifactId>example-event-source</artifactId>
+                                <classifier>yaml</classifier>
+                                <version>${project.version}</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                    <plugin>
+                        <groupId>uk.gov.justice.framework-generators</groupId>
+                        <artifactId>messaging-client-generator-plugin</artifactId>
+                        <version>${framework-generators.version}</version>
+                        <executions>
+                            <execution>
+                                <id>generate-from-yaml</id>
+                                <goals>
+                                    <goal>generate-messaging-client</goal>
+                                </goals>
+                                <phase>generate-sources</phase>
+                                <configuration>
+                                    <basePackageName>uk.gov.justice.api</basePackageName>
+                                    <generatorName>
+                                        uk.gov.justice.services.clients.messaging.subscription.generator.SubscriptionMessagingClientGeneratorFactory
+                                    </generatorName>
+                                    <parserName>uk.gov.justice.services.generators.subscription.parser.SubscriptionWrapperFileParserFactory</parserName>
+                                    <sourceDirectory>${basedir}/src/yaml</sourceDirectory>
+                                    <outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
+                                    <includes>
+                                        <include>**/public-subscriptions-descriptor.yaml</include>
+                                        <include>**/event-sources.yaml</include>
+                                    </includes>
+                                    <generatorProperties implementation="uk.gov.justice.services.generators.commons.config.CommonGeneratorProperties">
+                                        <serviceComponent>${cpp.service-component}</serviceComponent>
+                                    </generatorProperties>
+                                </configuration>
+                            </execution>
+                        </executions>
                         <dependencies>
                             <dependency>
                                 <groupId>javax</groupId>
                                 <artifactId>javaee-api</artifactId>
                                 <version>${javaee-api.version}</version>
                                 <scope>runtime</scope>
                             </dependency>
-                            <dependency>
-                                <groupId>uk.gov.justice.schema</groupId>
-                                <artifactId>catalog-generation</artifactId>
-                                <version>${json-schema-catalog.version}</version>
-                            </dependency>
                             <dependency>
                                 <groupId>uk.gov.justice.framework-generators</groupId>
-                                <artifactId>messaging-adapter-generator</artifactId>
+                                <artifactId>messaging-client-generator</artifactId>
                                 <version>${framework-generators.version}</version>
                             </dependency>
-                            <dependency>
-                                <groupId>uk.gov.justice.services</groupId>
-                                <artifactId>event-subscription</artifactId>
-                                <version>${framework.version}</version>
-                            </dependency>
                             <dependency>
                                 <groupId>uk.gov.justice.services.example</groupId>
                                 <artifactId>example-event-source</artifactId>

diff --git a/...le-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CatchupPerformanceIT.java b/...le-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CatchupPerformanceIT.java
@@ -25,7 +25,6 @@
 import uk.gov.justice.services.jmx.system.command.client.SystemCommanderClient;
 import uk.gov.justice.services.jmx.system.command.client.TestSystemCommanderClientFactory;
 import uk.gov.justice.services.jmx.system.command.client.connection.JmxParameters;
-import uk.gov.justice.services.jmx.system.command.client.connection.JmxParametersBuilder;
 import uk.gov.justice.services.test.utils.core.messaging.Poller;
 import uk.gov.justice.services.test.utils.persistence.DatabaseCleaner;
 

diff --git a/...xample-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/IndexerCatchUpIT.java b/...xample-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/IndexerCatchUpIT.java
@@ -26,7 +26,6 @@
 import uk.gov.justice.services.jmx.system.command.client.SystemCommanderClient;
 import uk.gov.justice.services.jmx.system.command.client.TestSystemCommanderClientFactory;
 import uk.gov.justice.services.jmx.system.command.client.connection.JmxParameters;
-import uk.gov.justice.services.jmx.system.command.client.connection.JmxParametersBuilder;
 import uk.gov.justice.services.test.utils.core.messaging.Poller;
 import uk.gov.justice.services.test.utils.persistence.DatabaseCleaner;
 

diff --git a/...rvice/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/RebuildIT.java b/...rvice/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/RebuildIT.java
@@ -28,7 +28,6 @@
 import uk.gov.justice.services.test.utils.persistence.DatabaseCleaner;
 import uk.gov.justice.services.test.utils.persistence.SequenceSetter;
 
-import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -141,11 +140,7 @@ private List<PublishedEvent> getPublishedEvents() {
     }
 
     private List<PublishedEvent> doGetPublishedEvents()  {
-        try {
-            return eventStoreDataAccess.findAllPublishedEventsOrderedByEventNumber();
-        } catch (SQLException e) {
-            throw new RuntimeException("Failed to get published events", e);
-        }
+        return eventStoreDataAccess.findAllPublishedEventsOrderedByEventNumber();
     }
 
     private boolean eventNumbersLinkedCorrectly(final List<PublishedEvent> publishedEvents) {