Simplified Gradle module structure

eventuate-examples · Dec 31, 2016 · 62667cd · 62667cd
1 parent 6e9f9c4
commit 62667cd
Show file tree

Hide file tree

Showing 63 changed files with 186 additions and 294 deletions.
diff --git a/...andside/web/CreateRestaurantResponse.java → ...rant/common/CreateRestaurantResponse.java b/...andside/web/CreateRestaurantResponse.java → ...rant/common/CreateRestaurantResponse.java
@@ -1,4 +1,4 @@
-package net.chrisrichardson.eventstore.examples.management.restaurant.commandside.web;
+package net.chrisrichardson.eventstore.examples.management.restaurant.common;
 
 
 public class CreateRestaurantResponse {

diff --git a/...andside/web/DeleteRestaurantResponse.java → ...rant/common/DeleteRestaurantResponse.java b/...andside/web/DeleteRestaurantResponse.java → ...rant/common/DeleteRestaurantResponse.java
@@ -1,4 +1,4 @@
-package net.chrisrichardson.eventstore.examples.management.restaurant.commandside.web;
+package net.chrisrichardson.eventstore.examples.management.restaurant.common;
 
 public class DeleteRestaurantResponse {
 

diff --git a/.../web/FindAvailableRestaurantsRequest.java → ...mmon/FindAvailableRestaurantsRequest.java b/.../web/FindAvailableRestaurantsRequest.java → ...mmon/FindAvailableRestaurantsRequest.java
@@ -1,8 +1,6 @@
-package net.chrisrichardson.eventstore.examples.management.restaurant.queryside.web;
+package net.chrisrichardson.eventstore.examples.management.restaurant.common;
 
 
-import net.chrisrichardson.eventstore.examples.management.restaurant.common.Address;
-import net.chrisrichardson.eventstore.examples.management.restaurant.common.DeliveryTime;
 import org.apache.commons.lang.builder.ToStringBuilder;
 
 public class FindAvailableRestaurantsRequest {

diff --git a/...andside/web/UpdateRestaurantResponse.java → ...rant/common/UpdateRestaurantResponse.java b/...andside/web/UpdateRestaurantResponse.java → ...rant/common/UpdateRestaurantResponse.java
@@ -1,4 +1,4 @@
-package net.chrisrichardson.eventstore.examples.management.restaurant.commandside.web;
+package net.chrisrichardson.eventstore.examples.management.restaurant.common;
 
 
 public class UpdateRestaurantResponse {

diff --git a/...risrichardson/eventstore/examples/management/restaurant/common/event/RestaurantEvent.java b/...risrichardson/eventstore/examples/management/restaurant/common/event/RestaurantEvent.java
@@ -4,6 +4,6 @@
 import io.eventuate.Event;
 import io.eventuate.EventEntity;
 
-@EventEntity(entity="net.chrisrichardson.eventstore.examples.management.restaurant.commandside.RestaurantAggregate")
+@EventEntity(entity="net.chrisrichardson.eventstore.examples.management.restaurantsservice.backend.RestaurantAggregate")
 public abstract  class RestaurantEvent implements Event {
 }
diff --git a/common-tests/build.gradle b/common-tests/build.gradle
@@ -1,8 +1,6 @@
 dependencies {
     compile project(":testutil")
     compile project(":common-restaurants")
-    compile project(":restaurants-command-side-web")
-    compile project(":restaurants-query-side-web")
 
     compile "org.springframework.boot:spring-boot-starter-web:$springBootVersion"
 

diff --git a/...s/management/restaurant/integrationtests/AbstractRestaurantManagementIntegrationTest.java b/...s/management/restaurant/integrationtests/AbstractRestaurantManagementIntegrationTest.java
@@ -1,11 +1,6 @@
 package net.chrisrichardson.eventstore.examples.management.restaurant.integrationtests;
 
-import net.chrisrichardson.eventstore.examples.management.restaurant.commandside.web.CreateRestaurantResponse;
-import net.chrisrichardson.eventstore.examples.management.restaurant.commandside.web.UpdateRestaurantResponse;
-import net.chrisrichardson.eventstore.examples.management.restaurant.common.Address;
-import net.chrisrichardson.eventstore.examples.management.restaurant.common.DeliveryTime;
-import net.chrisrichardson.eventstore.examples.management.restaurant.common.RestaurantInfo;
-import net.chrisrichardson.eventstore.examples.management.restaurant.queryside.web.FindAvailableRestaurantsRequest;
+import net.chrisrichardson.eventstore.examples.management.restaurant.common.*;
 import net.chrisrichardson.eventstore.examples.management.restaurant.testutil.RestaurantMother;
 import net.chrisrichardson.eventstore.examples.management.restaurant.testutil.RestaurantTestData;
 import org.junit.Assert;

diff --git a/docker-compose-common.yml b/docker-compose-common.yml
@@ -4,13 +4,13 @@ redis:
   ports:
     - "6379:6379"
 
-restaurantscommandside:
-  build: ./restaurants-command-side-service/
+restaurants:
+  build: ./restaurants-service/
   ports:
     - "8081:8080"
 
-restaurantsqueryside:
-  build: ./restaurants-query-side-service/
+restaurantsview:
+  build: ./restaurants-view-service/
   ports:
     - "8082:8080"
   environment:

diff --git a/docker-compose-eventuate-local.yml b/docker-compose-eventuate-local.yml
@@ -50,12 +50,12 @@ redis:
     file: docker-compose-common.yml
     service: redis
 
-restaurantscommandside:
+restaurants:
   extends:
     file: docker-compose-common.yml
-    service: restaurantscommandside
+    service: restaurants
   volumes:
-    - ./restaurants-command-side-service/build/libs:/app
+    - ./restaurants-service/build/libs:/app
   links:
     - mysql
     - kafka
@@ -70,12 +70,12 @@ restaurantscommandside:
     EVENTUATELOCAL_CDC_DB_USER_NAME: root
     EVENTUATELOCAL_CDC_DB_PASSWORD: rootpassword
 
-restaurantsqueryside:
+restaurantsview:
   extends:
     file: docker-compose-common.yml
-    service: restaurantsqueryside
+    service: restaurantsview
   volumes:
-    - ./restaurants-query-side-service/build/libs:/app
+    - ./restaurants-view-service/build/libs:/app
   links:
     - redis
     - mysql

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,22 +3,22 @@ redis:
     file: docker-compose-common.yml
     service: redis
 
-restaurantscommandside:
+restaurants:
   extends:
     file: docker-compose-common.yml
-    service: restaurantscommandside
+    service: restaurants
   volumes:
-    - ./restaurants-command-side-service/build/libs:/app
+    - ./restaurants-service/build/libs:/app
   environment:
     EVENTUATE_API_KEY_ID: ${EVENTUATE_API_KEY_ID}
     EVENTUATE_API_KEY_SECRET: ${EVENTUATE_API_KEY_SECRET}
 
-restaurantsqueryside:
+restaurantsview:
   extends:
     file: docker-compose-common.yml
-    service: restaurantsqueryside
+    service: restaurantsview
   volumes:
-    - ./restaurants-query-side-service/build/libs:/app
+    - ./restaurants-view-service/build/libs:/app
   links:
     - redis
   environment:

diff --git a/e2e-test/build.gradle b/e2e-test/build.gradle
@@ -1,5 +1,4 @@
 dependencies {
-    testCompile project(":restaurants-command-side-web")
     testCompile project(":common-tests")
     testCompile "org.springframework.boot:spring-boot-starter-web:$springBootVersion"
     testCompile "org.springframework.boot:spring-boot-starter-test:$springBootVersion"

diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,7 @@
 
 org.gradle.jvmargs=-XX:MaxPermSize=512m
 
-eventuateClientVersion=0.10.0.RELEASE
-eventuateLocalVersion=0.4.0.RELEASE
-
 springBootVersion=1.3.5.RELEASE
+
+eventuateClientVersion=0.12.0.RELEASE
+eventuateLocalVersion=0.6.0.RELEASE
diff --git a/monolithic-service/build.gradle b/monolithic-service/build.gradle
diff --git a/...ardson/eventstore/examples/management/restaurant/monolithic/RestaurantsConfiguration.java b/...ardson/eventstore/examples/management/restaurant/monolithic/RestaurantsConfiguration.java
diff --git a/.../eventstore/examples/management/restaurant/monolithic/main/RestaurantsMonolithicMain.java b/.../eventstore/examples/management/restaurant/monolithic/main/RestaurantsMonolithicMain.java
diff --git a/restaurants-command-side-service/Dockerfile b/restaurants-command-side-service/Dockerfile
diff --git a/...ventstore/examples/management/restaurant/commandside/main/RestaurantsCommandsideMain.java b/...ventstore/examples/management/restaurant/commandside/main/RestaurantsCommandsideMain.java
diff --git a/restaurants-command-side-web/build.gradle b/restaurants-command-side-web/build.gradle
diff --git a/...nagement/restaurant/commandside/web/RestaurantControllerIntegrationTestConfiguration.java b/...nagement/restaurant/commandside/web/RestaurantControllerIntegrationTestConfiguration.java
diff --git a/...aurants-command-side-backend/build.gradle → restaurants-integration-test/build.gradle b/...aurants-command-side-backend/build.gradle → restaurants-integration-test/build.gradle
@@ -1,8 +1,8 @@
 dependencies {
-    compile project(":common-restaurants")
+    testCompile project(":common-tests")
+    testCompile project(":restaurants-service")
+    testCompile project(":restaurants-view-service")
 
-    testCompile project(":testutil")
-    testCompile "junit:junit:4.11"
     testCompile "org.springframework.boot:spring-boot-starter-test:$springBootVersion"
     testCompile "io.eventuate.client.java:eventuate-client-java-jdbc:$eventuateClientVersion"
-}
+}
diff --git a/...onolithic/RestaurantsIntegrationTest.java → ...tionTests/RestaurantsIntegrationTest.java b/...onolithic/RestaurantsIntegrationTest.java → ...tionTests/RestaurantsIntegrationTest.java
@@ -1,4 +1,4 @@
-package net.chrisrichardson.eventstore.examples.management.restaurant.monolithic;
+package net.chrisrichardson.eventstore.examples.management.restaurant.integrationTests;
 
 import net.chrisrichardson.eventstore.examples.management.restaurant.integrationtests.AbstractRestaurantManagementIntegrationTest;
 import org.junit.runner.RunWith;

diff --git a/...taurantsIntegrationTestConfiguration.java → ...taurantsIntegrationTestConfiguration.java b/...taurantsIntegrationTestConfiguration.java → ...taurantsIntegrationTestConfiguration.java
@@ -1,9 +1,8 @@
-package net.chrisrichardson.eventstore.examples.management.restaurant.monolithic;
+package net.chrisrichardson.eventstore.examples.management.restaurant.integrationTests;
 
-import io.eventuate.javaclient.spring.jdbc.EventuateJdbcEventStoreConfiguration;
-import net.chrisrichardson.eventstore.examples.management.restaurant.commandside.RestaurantsCommandsideConfiguration;
-import net.chrisrichardson.eventstore.examples.management.restaurant.commonweb.WebConfiguration;
-import net.chrisrichardson.eventstore.examples.management.restaurant.queryside.RestaurantsQuerysideConfiguration;
+import io.eventuate.javaclient.spring.jdbc.EmbeddedTestAggregateStoreConfiguration;
+import net.chrisrichardson.eventstore.examples.management.restaurantsservice.web.RestaurantsWebConfiguration;
+import net.chrisrichardson.eventstore.examples.management.restaurantsviewservice.web.RestaurantsViewWebConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.web.HttpMessageConverters;
 import org.springframework.context.annotation.Bean;
@@ -19,7 +18,9 @@
 import java.util.List;
 
 @Configuration
-@Import({RestaurantsQuerysideConfiguration.class, RestaurantsCommandsideConfiguration.class, EventuateJdbcEventStoreConfiguration.class, WebConfiguration.class})
+@Import({RestaurantsViewWebConfiguration.class,
+        RestaurantsWebConfiguration.class,
+        EmbeddedTestAggregateStoreConfiguration.class})
 @EnableAutoConfiguration
 public class RestaurantsIntegrationTestConfiguration {
   @Bean

diff --git a/restaurants-query-side-service/Dockerfile b/restaurants-query-side-service/Dockerfile
diff --git a/restaurants-query-side-service/build.gradle b/restaurants-query-side-service/build.gradle
diff --git a/...on/eventstore/examples/management/restaurant/queryside/main/RestaurantsQuerysideMain.java b/...on/eventstore/examples/management/restaurant/queryside/main/RestaurantsQuerysideMain.java
diff --git a/restaurants-query-side-web/build.gradle b/restaurants-query-side-web/build.gradle
diff --git a/...t/restaurant/queryside/web/RestaurantQuerySideControllerIntegrationTestConfiguration.java b/...t/restaurant/queryside/web/RestaurantQuerySideControllerIntegrationTestConfiguration.java
diff --git a/restaurants-service/Dockerfile b/restaurants-service/Dockerfile
@@ -0,0 +1,3 @@
+FROM java:openjdk-8u91-jdk
+CMD java ${JAVA_OPTS} -jar restaurants-service.jar
+COPY build/libs/restaurants-service.jar .