#51 Replace shared API classes with codegen from OpenAPI/JSON schema - Used JSON schema for Restaurant events in Delivery Service

Author: cer

ftgo-delivery-service/build.gradle

@@ -7,11 +7,14 @@ apply plugin: 'docker-compose'
 
 apply plugin: IntegrationTestsPlugin
 apply plugin: ComponentTestsPlugin
+apply plugin: FtgoJSONSchema2PojoPlugin
 
 dependencies {
+    ftgoApiSpecification project(":ftgo-restaurant-service-api-spec")
+
     compile project(":ftgo-delivery-service-api")
     compile project(":ftgo-kitchen-service-api")
-    compile project(":ftgo-restaurant-service-api")
+    compile project(":ftgo-restaurant-service-api-temp")
     compile project(":ftgo-order-service-api")
     compile project(":ftgo-common")
     compile project(":ftgo-common-jpa")
@@ -45,3 +48,15 @@ dockerCompose {
 
 componentTestsComposeUp.dependsOn(assemble)
 dockerCompose.componentTests.isRequiredBy(componentTest)
+
+ftgoJsonSchema2Pojo {
+
+    ftgoRestaurantService {
+        source = files("${ftgoApiSpecsDir}/ftgo-restaurant-service-api-spec")
+        targetPackage = "net.chrisrichardson.ftgo.restaurantservice.events"
+        includeAdditionalProperties = false
+        generateBuilders = true
+        useLongIntegers = true
+    }
+
+}

ftgo-delivery-service/src/component-test/java/net/chrisrichardson/ftgo/deliveryservice/DeliveryServiceInProcessComponentTest.java

@@ -12,7 +12,6 @@
 import net.chrisrichardson.ftgo.orderservice.api.events.OrderCreatedEvent;
 import net.chrisrichardson.ftgo.orderservice.api.events.OrderDetails;
 import net.chrisrichardson.ftgo.restaurantservice.RestaurantServiceChannels;
-import net.chrisrichardson.ftgo.restaurantservice.events.RestaurantCreated;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,7 +20,6 @@
 import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import java.util.Collections;
@@ -120,7 +118,8 @@ private void createOrder() {
   private void createRestaurant() {
     restaurantId = System.currentTimeMillis();
 
-    domainEventPublisher.publish(RestaurantServiceChannels.RESTAURANT_EVENT_CHANNEL, restaurantId, Collections.singletonList(new RestaurantCreated("Delicious Indian", DeliveryServiceTestData.PICKUP_ADDRESS, null)));
+    domainEventPublisher.publish(RestaurantServiceChannels.RESTAURANT_EVENT_CHANNEL, restaurantId,
+            Collections.singletonList(RestaurantEventMother.makeRestaurantCreated()));
 
     eventually(() -> assertTrue(restaurantRepository.findById(restaurantId).isPresent()));
   }

ftgo-delivery-service/src/component-test/java/net/chrisrichardson/ftgo/deliveryservice/DeliveryServiceOutOfProcessComponentTest.java

@@ -8,7 +8,6 @@
 import net.chrisrichardson.ftgo.orderservice.api.events.OrderCreatedEvent;
 import net.chrisrichardson.ftgo.orderservice.api.events.OrderDetails;
 import net.chrisrichardson.ftgo.restaurantservice.RestaurantServiceChannels;
-import net.chrisrichardson.ftgo.restaurantservice.events.RestaurantCreated;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,7 +23,8 @@
 
 import static com.jayway.restassured.RestAssured.given;
 import static io.eventuate.util.test.async.Eventually.eventually;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = DeliveryServiceOutOfProcessComponentTest.Config.class, webEnvironment = SpringBootTest.WebEnvironment.NONE)
@@ -106,7 +106,7 @@ private void createOrder() {
   private void createRestaurant() {
     restaurantId = System.currentTimeMillis();
 
-    domainEventPublisher.publish(RestaurantServiceChannels.RESTAURANT_EVENT_CHANNEL, restaurantId, Collections.singletonList(new RestaurantCreated("Delicious Indian", DeliveryServiceTestData.PICKUP_ADDRESS, null)));
+    domainEventPublisher.publish(RestaurantServiceChannels.RESTAURANT_EVENT_CHANNEL, restaurantId, Collections.singletonList(RestaurantEventMother.makeRestaurantCreated()));
 
     sleep();
   }

ftgo-delivery-service/src/component-test/java/net/chrisrichardson/ftgo/deliveryservice/RestaurantEventMother.java

@@ -0,0 +1,13 @@
+package net.chrisrichardson.ftgo.deliveryservice;
+
+import net.chrisrichardson.ftgo.deliveryservice.domain.DeliveryServiceTestData;
+import net.chrisrichardson.ftgo.deliveryservice.messaging.RestaurantEventMapper;
+import net.chrisrichardson.ftgo.restaurantservice.events.RestaurantCreated;
+
+public class RestaurantEventMother {
+  static RestaurantCreated makeRestaurantCreated() {
+    return new RestaurantCreated()
+            .withName("Delicious Indian")
+            .withAddress(RestaurantEventMapper.fromAddress(DeliveryServiceTestData.PICKUP_ADDRESS)).withMenu(null);
+  }
+}

ftgo-delivery-service/src/main/java/net/chrisrichardson/ftgo/deliveryservice/messaging/DeliveryMessageHandlers.java

@@ -36,7 +36,7 @@ public DomainEventHandlers domainEventHandlers() {
   }
 
   public void handleRestaurantCreated(DomainEventEnvelope<RestaurantCreated> dee) {
-    Address address = dee.getEvent().getAddress();
+    Address address = RestaurantEventMapper.toAddress(dee.getEvent().getAddress());
     deliveryService.createRestaurant(Long.parseLong(dee.getAggregateId()), dee.getEvent().getName(), address);
   }
 

ftgo-delivery-service/src/main/java/net/chrisrichardson/ftgo/deliveryservice/messaging/RestaurantEventMapper.java

@@ -0,0 +1,15 @@
+package net.chrisrichardson.ftgo.deliveryservice.messaging;
+
+import net.chrisrichardson.ftgo.common.Address;
+
+public class RestaurantEventMapper {
+
+  public static Address toAddress(net.chrisrichardson.ftgo.restaurantservice.events.Address address) {
+    return new Address(address.getStreet1(), address.getStreet2(), address.getCity(), address.getState(), address.getZip());
+  }
+
+  public static net.chrisrichardson.ftgo.restaurantservice.events.Address fromAddress(net.chrisrichardson.ftgo.common.Address a) {
+    return new net.chrisrichardson.ftgo.restaurantservice.events.Address().withStreet1(a.getStreet1()).withStreet2(a.getStreet2()).withCity(a.getCity()).withZip(a.getZip());
+  }
+
+}