Clean up

dartartem · Dec 7, 2017 · 00be2d8 · 00be2d8
1 parent 90faddd
commit 00be2d8
Show file tree

Hide file tree

Showing 25 changed files with 21 additions and 253 deletions.
diff --git a/customer-service/build.gradle b/customer-service/build.gradle
@@ -1,5 +1,5 @@
 dependencies {
-    compile project(":customer-web")
+    compile project(":customer-web-api")
 
     compile "org.springframework.boot:spring-boot-starter-actuator:$springBootVersion"
 

diff --git a/...io/eventuate/examples/tram/sagas/ordersandcustomers/customers/web/CustomerController.java b/...io/eventuate/examples/tram/sagas/ordersandcustomers/customers/web/CustomerController.java
@@ -2,6 +2,8 @@
 
 import io.eventuate.examples.tram.sagas.ordersandcustomers.customers.domain.Customer;
 import io.eventuate.examples.tram.sagas.ordersandcustomers.customers.service.CustomerService;
+import io.eventuate.examples.tram.sagas.ordersandcustomers.customers.webapi.CreateCustomerRequest;
+import io.eventuate.examples.tram.sagas.ordersandcustomers.customers.webapi.CreateCustomerResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

diff --git a/customer-web/build.gradle → customer-web-api/build.gradle b/customer-web/build.gradle → customer-web-api/build.gradle
diff --git a/.../customers/web/CreateCustomerRequest.java → ...stomers/webapi/CreateCustomerRequest.java b/.../customers/web/CreateCustomerRequest.java → ...stomers/webapi/CreateCustomerRequest.java
@@ -1,4 +1,4 @@
-package io.eventuate.examples.tram.sagas.ordersandcustomers.customers.web;
+package io.eventuate.examples.tram.sagas.ordersandcustomers.customers.webapi;
 
 import io.eventuate.examples.tram.sagas.ordersandcustomers.commondomain.Money;
 

diff --git a/...customers/web/CreateCustomerResponse.java → ...tomers/webapi/CreateCustomerResponse.java b/...customers/web/CreateCustomerResponse.java → ...tomers/webapi/CreateCustomerResponse.java
@@ -1,4 +1,4 @@
-package io.eventuate.examples.tram.sagas.ordersandcustomers.customers.web;
+package io.eventuate.examples.tram.sagas.ordersandcustomers.customers.webapi;
 
 
 public class CreateCustomerResponse {

diff --git a/customer-web/Dockerfile b/customer-web/Dockerfile
diff --git a/...eventuate/examples/tram/sagas/ordersandcustomers/customers/web/CreateCustomerRequest.java b/...eventuate/examples/tram/sagas/ordersandcustomers/customers/web/CreateCustomerRequest.java
diff --git a/...ventuate/examples/tram/sagas/ordersandcustomers/customers/web/CreateCustomerResponse.java b/...ventuate/examples/tram/sagas/ordersandcustomers/customers/web/CreateCustomerResponse.java
diff --git a/...io/eventuate/examples/tram/sagas/ordersandcustomers/customers/web/CustomerController.java b/...io/eventuate/examples/tram/sagas/ordersandcustomers/customers/web/CustomerController.java
diff --git a/...ntuate/examples/tram/sagas/ordersandcustomers/customers/web/CustomerWebConfiguration.java b/...ntuate/examples/tram/sagas/ordersandcustomers/customers/web/CustomerWebConfiguration.java
diff --git a/end-to-end-tests/build.gradle b/end-to-end-tests/build.gradle
@@ -1,6 +1,6 @@
 dependencies {
-    compile project(":customer-web")
-    compile project(":order-web")
+    compile project(":customer-web-api")
+    compile project(":order-web-api")
 
     testCompile "org.springframework.boot:spring-boot-starter-test:${springBootVersion}"
 }

diff --git a/...tuate/examples/tram/sagas/ordersandcustomers/endtoendtests/CustomersAndOrdersE2ETest.java b/...tuate/examples/tram/sagas/ordersandcustomers/endtoendtests/CustomersAndOrdersE2ETest.java
@@ -1,12 +1,12 @@
 package io.eventuate.examples.tram.sagas.ordersandcustomers.endtoendtests;
 
 import io.eventuate.examples.tram.sagas.ordersandcustomers.commondomain.Money;
-import io.eventuate.examples.tram.sagas.ordersandcustomers.customers.web.CreateCustomerRequest;
-import io.eventuate.examples.tram.sagas.ordersandcustomers.customers.web.CreateCustomerResponse;
+import io.eventuate.examples.tram.sagas.ordersandcustomers.customers.webapi.CreateCustomerRequest;
+import io.eventuate.examples.tram.sagas.ordersandcustomers.customers.webapi.CreateCustomerResponse;
 import io.eventuate.examples.tram.sagas.ordersandcustomers.orders.domain.OrderState;
-import io.eventuate.examples.tram.sagas.ordersandcustomers.orders.web.CreateOrderRequest;
-import io.eventuate.examples.tram.sagas.ordersandcustomers.orders.web.CreateOrderResponse;
-import io.eventuate.examples.tram.sagas.ordersandcustomers.orders.web.GetOrderResponse;
+import io.eventuate.examples.tram.sagas.ordersandcustomers.orders.webapi.CreateOrderRequest;
+import io.eventuate.examples.tram.sagas.ordersandcustomers.orders.webapi.CreateOrderResponse;
+import io.eventuate.examples.tram.sagas.ordersandcustomers.orders.webapi.GetOrderResponse;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/order-service/build.gradle b/order-service/build.gradle
@@ -1,5 +1,5 @@
 dependencies {
-    compile project(":order-web")
+    compile project(":order-web-api")
 
     compile "org.springframework.boot:spring-boot-starter-actuator:$springBootVersion"
 

diff --git a/...a/io/eventuate/examples/tram/sagas/ordersandcustomers/orders/web/CreateOrderResponse.java b/...a/io/eventuate/examples/tram/sagas/ordersandcustomers/orders/web/CreateOrderResponse.java
diff --git a/.../java/io/eventuate/examples/tram/sagas/ordersandcustomers/orders/web/OrderController.java b/.../java/io/eventuate/examples/tram/sagas/ordersandcustomers/orders/web/OrderController.java
@@ -4,6 +4,9 @@
 import io.eventuate.examples.tram.sagas.ordersandcustomers.orders.domain.Order;
 import io.eventuate.examples.tram.sagas.ordersandcustomers.orders.domain.OrderRepository;
 import io.eventuate.examples.tram.sagas.ordersandcustomers.orders.service.OrderService;
+import io.eventuate.examples.tram.sagas.ordersandcustomers.orders.webapi.CreateOrderRequest;
+import io.eventuate.examples.tram.sagas.ordersandcustomers.orders.webapi.CreateOrderResponse;
+import io.eventuate.examples.tram.sagas.ordersandcustomers.orders.webapi.GetOrderResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

diff --git a/order-web/build.gradle → order-web-api/build.gradle b/order-web/build.gradle → order-web-api/build.gradle
diff --git a/...tomers/orders/web/CreateOrderRequest.java → ...ers/orders/webapi/CreateOrderRequest.java b/...tomers/orders/web/CreateOrderRequest.java → ...ers/orders/webapi/CreateOrderRequest.java
@@ -1,4 +1,4 @@
-package io.eventuate.examples.tram.sagas.ordersandcustomers.orders.web;
+package io.eventuate.examples.tram.sagas.ordersandcustomers.orders.webapi;
 
 
 import io.eventuate.examples.tram.sagas.ordersandcustomers.commondomain.Money;

diff --git a/...omers/orders/web/CreateOrderResponse.java → ...rs/orders/webapi/CreateOrderResponse.java b/...omers/orders/web/CreateOrderResponse.java → ...rs/orders/webapi/CreateOrderResponse.java
@@ -1,4 +1,4 @@
-package io.eventuate.examples.tram.sagas.ordersandcustomers.orders.web;
+package io.eventuate.examples.tram.sagas.ordersandcustomers.orders.webapi;
 
 
 public class CreateOrderResponse {

diff --git a/...ustomers/orders/web/GetOrderResponse.java → ...omers/orders/webapi/GetOrderResponse.java b/...ustomers/orders/web/GetOrderResponse.java → ...omers/orders/webapi/GetOrderResponse.java
@@ -1,4 +1,4 @@
-package io.eventuate.examples.tram.sagas.ordersandcustomers.orders.web;
+package io.eventuate.examples.tram.sagas.ordersandcustomers.orders.webapi;
 
 
 import io.eventuate.examples.tram.sagas.ordersandcustomers.orders.domain.OrderState;

diff --git a/order-web/Dockerfile b/order-web/Dockerfile
diff --git a/...va/io/eventuate/examples/tram/sagas/ordersandcustomers/orders/web/CreateOrderRequest.java b/...va/io/eventuate/examples/tram/sagas/ordersandcustomers/orders/web/CreateOrderRequest.java
diff --git a/...java/io/eventuate/examples/tram/sagas/ordersandcustomers/orders/web/GetOrderResponse.java b/...java/io/eventuate/examples/tram/sagas/ordersandcustomers/orders/web/GetOrderResponse.java
diff --git a/.../java/io/eventuate/examples/tram/sagas/ordersandcustomers/orders/web/OrderController.java b/.../java/io/eventuate/examples/tram/sagas/ordersandcustomers/orders/web/OrderController.java
diff --git a/...io/eventuate/examples/tram/sagas/ordersandcustomers/orders/web/OrderWebConfiguration.java b/...io/eventuate/examples/tram/sagas/ordersandcustomers/orders/web/OrderWebConfiguration.java
diff --git a/settings.gradle b/settings.gradle
@@ -2,10 +2,10 @@ include 'common'
 include 'common-swagger'
 include 'customer-api'
 include 'customer-backend'
-include 'customer-web'
+include 'customer-web-api'
 include 'customer-service'
 include 'order-backend'
-include 'order-web'
+include 'order-web-api'
 include 'order-service'
 include 'integration-tests'
 include 'end-to-end-tests'