Merge pull request #410 from CJSCommonPlatform/framework-api-tweaks

Framework API tweaks

Author: purple52

aggregate-snapshot/aggregate-snapshot-domain/pom.xml

@@ -18,7 +18,7 @@
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
-            <artifactId>framework-api-aggregate</artifactId>
+            <artifactId>framework-api-aggregate-service</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -37,4 +37,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-</project>
+</project>

framework-api/framework-api-aggregate/src/main/java/uk/gov/justice/services/core/aggregate/exception/AggregateChangeDetectedException.java renamed to aggregate-snapshot/aggregate-snapshot-domain/src/main/java/uk/gov/justice/services/core/aggregate/exception/AggregateChangeDetectedException.java

@@ -55,4 +55,4 @@ public Object apply(Object event) {
                     recordedEventStates.add(event);
                 }));
     }
-}
+}

aggregate-snapshot/aggregate-snapshot-service/src/test/java/uk/gov/justice/domain/aggregate/TestAggregate.java

@@ -19,7 +19,7 @@
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
-            <artifactId>framework-api-aggregate</artifactId>
+            <artifactId>framework-api-aggregate-service</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

framework-api/framework-api-aggregate/src/test/java/uk/gov/justice/services/core/aggregate/exception/AggregateChangeDetectedExceptionTest.java renamed to aggregate-snapshot/aggregate-snapshot-service/src/test/java/uk/gov/justice/services/core/aggregate/exception/AggregateChangeDetectedExceptionTest.java

@@ -50,4 +50,4 @@ public Object apply(Object event) {
                     recordedEventStates.add(event);
                 }));
     }
-}
+}

aggregate/pom.xml

@@ -17,7 +17,6 @@
 import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter;
 import uk.gov.justice.services.core.aggregate.event.EventA;
 import uk.gov.justice.services.core.aggregate.event.EventB;
-import uk.gov.justice.services.core.aggregate.exception.AggregateChangeDetectedException;
 import uk.gov.justice.services.core.extension.EventFoundEvent;
 import uk.gov.justice.services.eventsourcing.source.core.EventStream;
 
@@ -58,7 +57,7 @@ private void registerEvent(Class clazz, String name) {
     }
 
     @Test
-    public void shouldCreateAggregateFromEmptyStream() throws AggregateChangeDetectedException {
+    public void shouldCreateAggregateFromEmptyStream() {
         when(eventStream.read()).thenReturn(Stream.empty());
         when(eventStream.getId()).thenReturn(STREAM_ID);
         TestAggregate aggregate = aggregateService.get(eventStream, TestAggregate.class);
@@ -69,7 +68,7 @@ public void shouldCreateAggregateFromEmptyStream() throws AggregateChangeDetecte
     }
 
     @Test
-    public void shouldCreateAggregateFromSingletonStream() throws AggregateChangeDetectedException {
+    public void shouldCreateAggregateFromSingletonStream() {
         JsonObject eventPayloadA = mock(JsonObject.class);
         EventA eventA = mock(EventA.class);
         when(jsonObjectToObjectConverter.convert(eventPayloadA, EventA.class)).thenReturn(eventA);
@@ -88,7 +87,7 @@ public void shouldCreateAggregateFromSingletonStream() throws AggregateChangeDet
     }
 
     @Test
-    public void shouldCreateAggregateFromStreamOfTwo() throws AggregateChangeDetectedException {
+    public void shouldCreateAggregateFromStreamOfTwo() {
         JsonObject eventPayloadA = mock(JsonObject.class);
         JsonObject eventPayloadB = mock(JsonObject.class);
         EventA eventA = mock(EventA.class);
@@ -116,7 +115,7 @@ public void shouldCreateAggregateFromStreamOfTwo() throws AggregateChangeDetecte
     }
 
     @Test(expected = IllegalStateException.class)
-    public void shouldThrowExceptionForUnregisteredEvent() throws AggregateChangeDetectedException {
+    public void shouldThrowExceptionForUnregisteredEvent() {
         when(eventStream.getId()).thenReturn(STREAM_ID);
 
         JsonObject eventPayloadA = mock(JsonObject.class);
@@ -128,7 +127,7 @@ public void shouldThrowExceptionForUnregisteredEvent() throws AggregateChangeDet
     }
 
     @Test(expected = RuntimeException.class)
-    public void shouldThrowExceptionForNonInstantiatableEvent() throws AggregateChangeDetectedException {
+    public void shouldThrowExceptionForNonInstantiatableEvent() {
         JsonObject eventPayloadA = mock(JsonObject.class);
         EventA eventA = mock(EventA.class);
         when(jsonObjectToObjectConverter.convert(eventPayloadA, EventA.class)).thenReturn(eventA);

aggregate/src/test/java/uk/gov/justice/domain/aggregate/TestAggregate.java

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>framework-api-aggregate</artifactId>
+    <artifactId>framework-api-aggregate-service</artifactId>
 
     <dependencies>
         <dependency>
@@ -35,4 +35,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-</project>
+</project>