Clean up.

_build-and-test-all.sh

@@ -7,10 +7,12 @@ set -e
 
 docker-compose -f docker-compose-${DATABASE?}.yml down -v
 
-docker-compose -f docker-compose-${DATABASE?}.yml up -d --build zookeeper ${DATABASE?} kafka cdcservice
+docker-compose -f docker-compose-${DATABASE?}.yml up -d --build zookeeper ${DATABASE?} kafka
 
 ./wait-for-${DATABASE?}.sh
 
+docker-compose -f docker-compose-${DATABASE?}.yml up -d --build cdcservice
+
 ./wait-for-services.sh $DOCKER_HOST_IP "8099"
 
 ./gradlew -x :end-to-end-tests:test build

common/build.gradle

@@ -11,10 +11,5 @@ dependencies {
 
     compile "org.springframework.boot:spring-boot-starter-data-jpa:$springBootVersion"
     compile "org.springframework.boot:spring-boot-starter-web:$springBootVersion"
-    compile "org.springframework.boot:spring-boot-starter-actuator:$springBootVersion"
-    compile 'javax.el:javax.el-api:2.2.5'
-
-    compile "com.fasterxml.jackson.core:jackson-core:2.4.3"
-    compile "com.fasterxml.jackson.core:jackson-databind:2.4.3"
 }
 

customer-backend/build.gradle

@@ -0,0 +1,5 @@
+dependencies {
+    compile project(":common")
+    compile project(":customer-api")
+    compile project(":common-swagger")
+}

customer-common/src/main/java/io/eventuate/examples/tram/sagas/ordersandcustomers/customers/CustomerConfiguration.java → customer-backend/src/main/java/io/eventuate/examples/tram/sagas/ordersandcustomers/customers/CustomerConfiguration.java

@@ -2,7 +2,6 @@
 
 import io.eventuate.examples.tram.sagas.ordersandcustomers.customers.service.CustomerCommandHandler;
 import io.eventuate.examples.tram.sagas.ordersandcustomers.customers.service.CustomerService;
-import io.eventuate.examples.tram.sagas.ordersandcustomers.customers.web.CustomerWebConfiguration;
 import io.eventuate.tram.commands.consumer.CommandDispatcher;
 import io.eventuate.tram.sagas.participant.SagaCommandDispatcher;
 import io.eventuate.tram.sagas.participant.SagaLockManager;
@@ -14,7 +13,7 @@
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
 @Configuration
-@Import({SagaParticipantConfiguration.class, CustomerWebConfiguration.class})
+@Import(SagaParticipantConfiguration.class)
 @EnableJpaRepositories
 @EnableAutoConfiguration
 public class CustomerConfiguration {

customer-service/build.gradle

@@ -1,8 +1,5 @@
 dependencies {
-    compile project(":common")
-    compile project(":common-swagger")
-    compile project(":customer-common")
-
+    compile project(":customer-web")
 
     compile "org.springframework.boot:spring-boot-starter-actuator:$springBootVersion"
 

customer-service/src/main/java/io/eventuate/examples/tram/sagas/ordersandcustomers/customers/CustomersServiceMain.java

@@ -1,5 +1,6 @@
 package io.eventuate.examples.tram.sagas.ordersandcustomers.customers;
 
+import io.eventuate.examples.tram.sagas.ordersandcustomers.customers.web.CustomerWebConfiguration;
 import io.eventuate.jdbckafka.TramJdbcKafkaConfiguration;
 import io.eventuate.tram.commands.common.ChannelMapping;
 import io.eventuate.tram.commands.common.DefaultChannelMapping;
@@ -16,6 +17,7 @@
 @SpringBootApplication
 @Configuration
 @Import({CustomerConfiguration.class,
+        CustomerWebConfiguration.class,
         TramEventsPublisherConfiguration.class,
         TramCommandProducerConfiguration.class,
         SagaOrchestratorConfiguration.class,

customer-web/Dockerfile

@@ -0,0 +1,3 @@
+FROM java:openjdk-8u111-alpine
+CMD java ${JAVA_OPTS} -jar customer-service-*.jar
+COPY build/libs/customer-service-*.jar .

customer-web/build.gradle

@@ -0,0 +1,4 @@
+dependencies {
+    compile project(":common-swagger")
+    compile project(":customer-backend")
+}

customer-web/src/main/java/io/eventuate/examples/tram/sagas/ordersandcustomers/customers/web/CreateCustomerRequest.java

@@ -0,0 +1,26 @@
+package io.eventuate.examples.tram.sagas.ordersandcustomers.customers.web;
+
+import io.eventuate.examples.tram.sagas.ordersandcustomers.commondomain.Money;
+
+public class CreateCustomerRequest {
+  private String name;
+  private Money creditLimit;
+
+  public CreateCustomerRequest() {
+  }
+
+  public CreateCustomerRequest(String name, Money creditLimit) {
+
+    this.name = name;
+    this.creditLimit = creditLimit;
+  }
+
+
+  public String getName() {
+    return name;
+  }
+
+  public Money getCreditLimit() {
+    return creditLimit;
+  }
+}

customer-web/src/main/java/io/eventuate/examples/tram/sagas/ordersandcustomers/customers/web/CreateCustomerResponse.java

@@ -0,0 +1,21 @@
+package io.eventuate.examples.tram.sagas.ordersandcustomers.customers.web;
+
+
+public class CreateCustomerResponse {
+  private Long customerId;
+
+  public CreateCustomerResponse() {
+  }
+
+  public CreateCustomerResponse(Long customerId) {
+    this.customerId = customerId;
+  }
+
+  public Long getCustomerId() {
+    return customerId;
+  }
+
+  public void setCustomerId(Long customerId) {
+    this.customerId = customerId;
+  }
+}

customer-web/src/main/java/io/eventuate/examples/tram/sagas/ordersandcustomers/customers/web/CustomerController.java

@@ -0,0 +1,23 @@
+package io.eventuate.examples.tram.sagas.ordersandcustomers.customers.web;
+
+import io.eventuate.examples.tram.sagas.ordersandcustomers.customers.domain.Customer;
+import io.eventuate.examples.tram.sagas.ordersandcustomers.customers.service.CustomerService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+public class CustomerController {
+
+  private CustomerService customerService;
+
+  @Autowired
+  public CustomerController(CustomerService customerService) {
+    this.customerService = customerService;
+  }
+
+  @RequestMapping(value = "/customers", method = RequestMethod.POST)
+  public CreateCustomerResponse createCustomer(@RequestBody CreateCustomerRequest createCustomerRequest) {
+    Customer customer = customerService.createCustomer(createCustomerRequest.getName(), createCustomerRequest.getCreditLimit());
+    return new CreateCustomerResponse(customer.getId());
+  }
+}

customer-web/src/main/java/io/eventuate/examples/tram/sagas/ordersandcustomers/customers/web/CustomerWebConfiguration.java

@@ -0,0 +1,22 @@
+package io.eventuate.examples.tram.sagas.ordersandcustomers.customers.web;
+
+import io.eventuate.examples.tram.sagas.ordersandcustomers.commonswagger.CommonSwaggerConfiguration;
+import org.springframework.boot.autoconfigure.web.HttpMessageConverters;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+
+@Configuration
+@ComponentScan
+@Import(CommonSwaggerConfiguration.class)
+public class CustomerWebConfiguration {
+
+  @Bean
+  public HttpMessageConverters customConverters() {
+    HttpMessageConverter<?> additional = new MappingJackson2HttpMessageConverter();
+    return new HttpMessageConverters(additional);
+  }
+}

end-to-end-tests/build.gradle

@@ -1,8 +1,7 @@
 dependencies {
-    compile project(":customer-common")
-    compile project(":order-common")
+    compile project(":customer-web")
+    compile project(":order-web")
 
-    testCompile "io.eventuate.tram.core:eventuate-tram-in-memory:$eventuateTramVersion"
     testCompile "org.springframework.boot:spring-boot-starter-test:${springBootVersion}"
 }
 

integration-tests/build.gradle

@@ -1,6 +1,6 @@
 dependencies {
-    compile project(":customer-common")
-    compile project(":order-common")
+    compile project(":customer-backend")
+    compile project(":order-backend")
 
     testCompile "io.eventuate.tram.core:eventuate-tram-in-memory:$eventuateTramVersion"
     testCompile "io.eventuate.tram.sagas:eventuate-tram-sagas-in-memory:$eventuateTramSagasVersion"

order-backend/build.gradle

@@ -0,0 +1,6 @@
+dependencies {
+    compile project(":customer-api")
+    compile project(":common-swagger")
+}
+
+

order-service/build.gradle

@@ -1,7 +1,5 @@
 dependencies {
-    compile project(":common")
-    compile project(":common-swagger")
-    compile project(":order-common")
+    compile project(":order-web")
 
     compile "org.springframework.boot:spring-boot-starter-actuator:$springBootVersion"
 

order-web/Dockerfile

@@ -0,0 +1,3 @@
+FROM java:openjdk-8u111-alpine
+CMD java ${JAVA_OPTS} -jar order-service-*.jar
+COPY build/libs/order-service-*.jar .

order-web/build.gradle

@@ -0,0 +1,6 @@
+dependencies {
+    compile project(":common-swagger")
+    compile project(":order-backend")
+}
+
+

order-web/src/main/java/io/eventuate/examples/tram/sagas/ordersandcustomers/orders/web/CreateOrderRequest.java

@@ -0,0 +1,25 @@
+package io.eventuate.examples.tram.sagas.ordersandcustomers.orders.web;
+
+
+import io.eventuate.examples.tram.sagas.ordersandcustomers.commondomain.Money;
+
+public class CreateOrderRequest {
+  private Money orderTotal;
+  private Long customerId;
+
+  public CreateOrderRequest() {
+  }
+
+  public CreateOrderRequest(Long customerId, Money orderTotal) {
+    this.customerId = customerId;
+    this.orderTotal = orderTotal;
+  }
+
+  public Money getOrderTotal() {
+    return orderTotal;
+  }
+
+  public Long getCustomerId() {
+    return customerId;
+  }
+}

order-web/src/main/java/io/eventuate/examples/tram/sagas/ordersandcustomers/orders/web/CreateOrderResponse.java

@@ -0,0 +1,17 @@
+package io.eventuate.examples.tram.sagas.ordersandcustomers.orders.web;
+
+
+public class CreateOrderResponse {
+  private Long orderId;
+
+  public CreateOrderResponse() {
+  }
+
+  public CreateOrderResponse(Long orderId) {
+    this.orderId = orderId;
+  }
+
+  public Long getOrderId() {
+    return orderId;
+  }
+}

order-web/src/main/java/io/eventuate/examples/tram/sagas/ordersandcustomers/orders/web/GetOrderResponse.java

@@ -0,0 +1,33 @@
+package io.eventuate.examples.tram.sagas.ordersandcustomers.orders.web;
+
+
+import io.eventuate.examples.tram.sagas.ordersandcustomers.orders.domain.OrderState;
+
+public class GetOrderResponse {
+  private Long orderId;
+  private OrderState orderState;
+
+  public GetOrderResponse() {
+  }
+
+  public GetOrderResponse(Long orderId, OrderState orderState) {
+    this.orderId = orderId;
+    this.orderState = orderState;
+  }
+
+  public Long getOrderId() {
+    return orderId;
+  }
+
+  public void setOrderId(Long orderId) {
+    this.orderId = orderId;
+  }
+
+  public OrderState getOrderState() {
+    return orderState;
+  }
+
+  public void setOrderState(OrderState orderState) {
+    this.orderState = orderState;
+  }
+}

order-web/src/main/java/io/eventuate/examples/tram/sagas/ordersandcustomers/orders/web/OrderController.java

@@ -0,0 +1,41 @@
+package io.eventuate.examples.tram.sagas.ordersandcustomers.orders.web;
+
+import io.eventuate.examples.tram.sagas.ordersandcustomers.orders.common.OrderDetails;
+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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+public class OrderController {
+
+  private OrderService orderService;
+  private OrderRepository orderRepository;
+
+  @Autowired
+  public OrderController(OrderService orderService, OrderRepository orderRepository) {
+    this.orderService = orderService;
+    this.orderRepository = orderRepository;
+  }
+
+  @RequestMapping(value = "/orders", method = RequestMethod.POST)
+  public CreateOrderResponse createOrder(@RequestBody CreateOrderRequest createOrderRequest) {
+    Order order = orderService.createOrder(new OrderDetails(createOrderRequest.getCustomerId(), createOrderRequest.getOrderTotal()));
+    return new CreateOrderResponse(order.getId());
+  }
+
+  @RequestMapping(value="/orders/{orderId}", method= RequestMethod.GET)
+  public ResponseEntity<GetOrderResponse> getOrder(@PathVariable Long orderId) {
+
+    Order order = orderRepository.findOne(orderId);
+
+    if (order == null) {
+        return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+    } else {
+        return new ResponseEntity<>(new GetOrderResponse(order.getId(), order.getState()), HttpStatus.OK);
+    }
+  }
+}