Move Subscription domain, parsing classes and builders to Framework

CJSCommonPlatform · Mar 7, 2019 · 74f9a4a · 74f9a4a
1 parent 030aa54
commit 74f9a4a
Show file tree

Hide file tree

Showing 82 changed files with 32 additions and 3,675 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,9 @@ on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to
 [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+## [2.0.0-M1] - 2019-03-07
+### Changed
+- Moved Subscription domain, parsing classes and builders to Framework
 
 ## [1.2.0-M4] - 2019-03-05
 ### Changed

diff --git a/aggregate-snapshot/aggregate-snapshot-service/pom.xml b/aggregate-snapshot/aggregate-snapshot-service/pom.xml
@@ -86,9 +86,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>uk.gov.justice.event-store</groupId>
+            <groupId>uk.gov.justice.services</groupId>
             <artifactId>event-subscription-test-utils</artifactId>
-            <version>${project.version}</version>
+            <version>${framework.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/...src/test/java/uk/gov/justice/services/core/aggregate/SnapshotAwareAggregateServiceIT.java b/...src/test/java/uk/gov/justice/services/core/aggregate/SnapshotAwareAggregateServiceIT.java
@@ -71,8 +71,8 @@
 import uk.gov.justice.subscription.ParserProducer;
 import uk.gov.justice.subscription.SubscriptionHelper;
 import uk.gov.justice.subscription.YamlFileFinder;
+import uk.gov.justice.subscription.domain.eventsource.DefaultEventSourceDefinitionFactory;
 import uk.gov.justice.subscription.domain.eventsource.EventSourceDefinition;
-import uk.gov.justice.subscription.registry.DefaultEventSourceDefinitionFactory;
 import uk.gov.justice.subscription.registry.EventSourceDefinitionRegistry;
 import uk.gov.justice.subscription.registry.EventSourceDefinitionRegistryProducer;
 import uk.gov.justice.subscription.yaml.parser.YamlParser;

diff --git a/event-buffer/event-buffer-api/pom.xml b/event-buffer/event-buffer-api/pom.xml
diff --git a/...uffer-api/src/main/java/uk/gov/justice/services/event/buffer/api/AbstractEventFilter.java b/...uffer-api/src/main/java/uk/gov/justice/services/event/buffer/api/AbstractEventFilter.java
diff --git a/...uffer-api/src/main/java/uk/gov/justice/services/event/buffer/api/AllowAllEventFilter.java b/...uffer-api/src/main/java/uk/gov/justice/services/event/buffer/api/AllowAllEventFilter.java
diff --git a/...buffer-api/src/main/java/uk/gov/justice/services/event/buffer/api/EventBufferService.java b/...buffer-api/src/main/java/uk/gov/justice/services/event/buffer/api/EventBufferService.java
diff --git a/.../event-buffer-api/src/main/java/uk/gov/justice/services/event/buffer/api/EventFilter.java b/.../event-buffer-api/src/main/java/uk/gov/justice/services/event/buffer/api/EventFilter.java
diff --git a/...r-api/src/test/java/uk/gov/justice/services/event/buffer/api/AbstractEventFilterTest.java b/...r-api/src/test/java/uk/gov/justice/services/event/buffer/api/AbstractEventFilterTest.java
diff --git a/...r-api/src/test/java/uk/gov/justice/services/event/buffer/api/AllowAllEventFilterTest.java b/...r-api/src/test/java/uk/gov/justice/services/event/buffer/api/AllowAllEventFilterTest.java
diff --git a/event-buffer/event-buffer-core/pom.xml b/event-buffer/event-buffer-core/pom.xml
@@ -16,16 +16,11 @@
             <artifactId>javaee-api</artifactId>
             <scope>provided</scope>
         </dependency>
-        <!--<dependency>-->
-            <!--<groupId>uk.gov.justice.services</groupId>-->
-            <!--<artifactId>persistence-jdbc</artifactId>-->
-            <!--<version>${project.version}</version>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>uk.gov.justice.services</groupId>-->
-            <!--<artifactId>event-buffer-api</artifactId>-->
-            <!--<version>${project.version}</version>-->
-        <!--</dependency>-->
+        <dependency>
+            <groupId>uk.gov.justice.framework-api</groupId>
+            <artifactId>framework-api-event-buffer</artifactId>
+            <version>${framework-api.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
@@ -70,11 +65,6 @@
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>persistence-jdbc</artifactId>
         </dependency>
-        <dependency>
-            <groupId>uk.gov.justice.event-store</groupId>
-            <artifactId>event-buffer-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
 
         <!--Test Dependencies-->
         <dependency>

diff --git a/event-buffer/pom.xml b/event-buffer/pom.xml
@@ -15,8 +15,6 @@
     <modules>
         <module>event-buffer-liquibase</module>
         <module>event-buffer-core</module>
-        <module>event-buffer-api</module>
     </modules>
 
-
 </project>
diff --git a/...rocess/src/test/java/uk/gov/justice/services/eventsourcing/publishing/EventPublishIT.java b/...rocess/src/test/java/uk/gov/justice/services/eventsourcing/publishing/EventPublishIT.java
@@ -50,7 +50,7 @@
 import uk.gov.justice.subscription.ParserProducer;
 import uk.gov.justice.subscription.SubscriptionHelper;
 import uk.gov.justice.subscription.YamlFileFinder;
-import uk.gov.justice.subscription.registry.DefaultEventSourceDefinitionFactory;
+import uk.gov.justice.subscription.domain.eventsource.DefaultEventSourceDefinitionFactory;
 import uk.gov.justice.subscription.registry.EventSourceDefinitionRegistry;
 import uk.gov.justice.subscription.registry.EventSourceDefinitionRegistryProducer;
 import uk.gov.justice.subscription.registry.SubscriptionDataSourceProvider;

diff --git a/...est/src/test/java/uk/gov/justice/services/eventsourcing/source/api/EventStreamPageIT.java b/...est/src/test/java/uk/gov/justice/services/eventsourcing/source/api/EventStreamPageIT.java
@@ -73,7 +73,7 @@
 import uk.gov.justice.subscription.ParserProducer;
 import uk.gov.justice.subscription.SubscriptionHelper;
 import uk.gov.justice.subscription.YamlFileFinder;
-import uk.gov.justice.subscription.registry.DefaultEventSourceDefinitionFactory;
+import uk.gov.justice.subscription.domain.eventsource.DefaultEventSourceDefinitionFactory;
 import uk.gov.justice.subscription.registry.EventSourceDefinitionRegistryProducer;
 import uk.gov.justice.subscription.yaml.parser.YamlParser;
 import uk.gov.justice.subscription.yaml.parser.YamlSchemaLoader;

diff --git a/...ion-test/src/test/java/uk/gov/justice/services/eventsourcing/source/api/EventsPageIT.java b/...ion-test/src/test/java/uk/gov/justice/services/eventsourcing/source/api/EventsPageIT.java
@@ -78,7 +78,7 @@
 import uk.gov.justice.subscription.ParserProducer;
 import uk.gov.justice.subscription.SubscriptionHelper;
 import uk.gov.justice.subscription.YamlFileFinder;
-import uk.gov.justice.subscription.registry.DefaultEventSourceDefinitionFactory;
+import uk.gov.justice.subscription.domain.eventsource.DefaultEventSourceDefinitionFactory;
 import uk.gov.justice.subscription.registry.EventSourceDefinitionRegistryProducer;
 import uk.gov.justice.subscription.yaml.parser.YamlParser;
 import uk.gov.justice.subscription.yaml.parser.YamlSchemaLoader;

diff --git a/event-sourcing/event-source/pom.xml b/event-sourcing/event-source/pom.xml
@@ -101,9 +101,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>uk.gov.justice.event-store</groupId>
+            <groupId>uk.gov.justice.services</groupId>
             <artifactId>event-subscription-test-utils</artifactId>
-            <version>${project.version}</version>
+            <version>${framework.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/event-sourcing/event-subscription-registry/pom.xml b/event-sourcing/event-subscription-registry/pom.xml
@@ -18,20 +18,20 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>uk.gov.justice.event-store</groupId>
+            <groupId>uk.gov.justice.services</groupId>
             <artifactId>event-subscription</artifactId>
-            <version>${project.version}</version>
+            <version>${framework.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>persistence-jdbc</artifactId>
         </dependency>
-        
+
         <!--Test dependencies-->
         <dependency>
-            <groupId>uk.gov.justice.event-store</groupId>
+            <groupId>uk.gov.justice.services</groupId>
             <artifactId>event-subscription-test-utils</artifactId>
-            <version>${project.version}</version>
+            <version>${framework.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/...c/main/java/uk/gov/justice/subscription/registry/DefaultEventSourceDefinitionFactory.java b/...c/main/java/uk/gov/justice/subscription/registry/DefaultEventSourceDefinitionFactory.java
diff --git a/...main/java/uk/gov/justice/subscription/registry/EventSourceDefinitionRegistryProducer.java b/...main/java/uk/gov/justice/subscription/registry/EventSourceDefinitionRegistryProducer.java
@@ -2,6 +2,7 @@
 
 import uk.gov.justice.subscription.EventSourcesParser;
 import uk.gov.justice.subscription.YamlFileFinder;
+import uk.gov.justice.subscription.domain.eventsource.DefaultEventSourceDefinitionFactory;
 import uk.gov.justice.subscription.domain.eventsource.EventSourceDefinition;
 
 import java.io.IOException;

diff --git a/...st/java/uk/gov/justice/subscription/registry/DefaultEventSourceDefinitionFactoryTest.java b/...st/java/uk/gov/justice/subscription/registry/DefaultEventSourceDefinitionFactoryTest.java
diff --git a/.../java/uk/gov/justice/subscription/registry/EventSourceDefinitionRegistryProducerTest.java b/.../java/uk/gov/justice/subscription/registry/EventSourceDefinitionRegistryProducerTest.java
@@ -15,6 +15,7 @@
 
 import uk.gov.justice.subscription.EventSourcesParser;
 import uk.gov.justice.subscription.YamlFileFinder;
+import uk.gov.justice.subscription.domain.eventsource.DefaultEventSourceDefinitionFactory;
 import uk.gov.justice.subscription.domain.eventsource.EventSourceDefinition;
 import uk.gov.justice.subscription.domain.eventsource.Location;