Support for Java 9+ and Misc cleanups

Author: cer

README.adoc

@@ -110,10 +110,9 @@ All the services' business logic is implemented using Domain-Driven design aggre
 
 === Pre-requisites
 
-* Java 8
+* Java 8+
 * Docker and Docker Compose
 * Internet access so that Gradle and Docker can download dependencies and container images
-* The link:./ftgo-order-history-service[ftgo-order-history-service] uses AWS DynamoDB and so requires an access key and secret.
 
 === Building
 
@@ -150,12 +149,6 @@ docker-compose up -d
 
 This can take a while.
 
-You also need to initialize the locally running DynamoDB by running:
-
-```
-  ./gradlew initDynamoDb
-```
-
 === Using the application
 
 Use the services Swagger UIs to invoke the services.

build-and-test-all.sh

@@ -2,6 +2,7 @@
 
 KEEP_RUNNING=
 ASSEMBLE_ONLY=
+DATABASE_SERVICES="dynamodblocal mysql dynamodblocal-init"
 
 if [ -z "$DOCKER_COMPOSE" ] ; then
     DOCKER_COMPOSE=docker-compose
@@ -34,14 +35,12 @@ echo KEEP_RUNNING=$KEEP_RUNNING
 ./gradlew testClasses
 
 ${DOCKER_COMPOSE?} down --remove-orphans -v
-${DOCKER_COMPOSE?} up -d --build dynamodblocal mysql
+${DOCKER_COMPOSE?} up -d --build ${DATABASE_SERVICES?}
 
 ./gradlew waitForMySql
 
 echo mysql is started
 
-./gradlew initDynamoDb
-
 ${DOCKER_COMPOSE?} up -d --build eventuate-local-cdc-service tram-cdc-service
 
 
@@ -62,29 +61,25 @@ if [ -z "$ASSEMBLE_ONLY" ] ; then
 
   ${DOCKER_COMPOSE?} down --remove-orphans -v
 
-  ${DOCKER_COMPOSE?} up -d dynamodblocal mysql
+  ${DOCKER_COMPOSE?} up -d ${DATABASE_SERVICES?}
 
   ./gradlew waitForMySql
 
   echo mysql is started
 
-  ./gradlew initDynamoDb
-
   ${DOCKER_COMPOSE?} up -d
 
 
 else
 
   ./gradlew $* assemble
 
-  ${DOCKER_COMPOSE?} up -d --build dynamodblocal mysql
+  ${DOCKER_COMPOSE?} up -d --build ${DATABASE_SERVICES?}
 
   ./gradlew waitForMySql
 
   echo mysql is started
 
-  ./gradlew initDynamoDb
-
   ${DOCKER_COMPOSE?} up -d --build
 
 fi

build.gradle

@@ -7,7 +7,6 @@ buildscript {
     }
 
     apply plugin: WaitForMySqlPlugin
-    apply plugin: InitDynamoDbPlugin
 }
 
 plugins {
@@ -39,4 +38,3 @@ subprojects {
     }
 
 }
-

buildSrc/src/main/groovy/InitDynamoDb.java

@@ -155,6 +155,7 @@ services:
           - zookeeper
           - tram-cdc-service
           - dynamodblocal
+          - dynamodblocal-init
         environment:
           SPRING_DATASOURCE_URL: jdbc:mysql://mysql/ftgoorderhistoryservice
           SPRING_DATASOURCE_USERNAME: mysqluser

buildSrc/src/main/groovy/InitDynamoDbPlugin.java

@@ -12,6 +12,7 @@
     "clean": "rm -fr dist"
   },
   "dependencies": {
+    "@types/graphql": "^14.0.0",
     "apollo-cache-inmemory": "^1.2.1",
     "apollo-client": "^2.3.1",
     "apollo-engine": "^1.0.1",

docker-compose.yml

@@ -8,5 +8,8 @@ dependencies {
 
     testCompile "org.springframework.boot:spring-boot-starter-test:$springBootVersion"
 
-
-}
+    runtime "javax.xml.bind:jaxb-api:2.2.11"
+    runtime "com.sun.xml.bind:jaxb-core:2.2.11"
+    runtime "com.sun.xml.bind:jaxb-impl:2.2.11"
+    runtime "javax.activation:activation:1.1.1"
+}

ftgo-api-gateway-graphql/package.json

@@ -3,7 +3,7 @@ spring.application.name=ftgo-order-service
 logging.level.root=INFO
 logging.level.org.hibernate.SQL=DEBUG
 logging.level.org.springframework.cloud.contract=DEBUG
-logging.level.io.eventuate=DEBUG
+logging.level.io.eventuate.tram=TRACE
 #logging.level.org.springframework.orm.jpa.JpaTransactionManager=TRACE
 
 spring.jpa.generate-ddl=true

ftgo-common/build.gradle

@@ -5,7 +5,7 @@ spring.sleuth.web.skipPattern=(^health.*)
 
 management.endpoints.web.exposure.include=health,prometheus
 
-logging.level.org.springframework.cloud=DEBUG
+logging.level.org.springframework.cloud=INFO
 
 spring.jpa.generate-ddl=true
 logging.level.org.springframework.orm.jpa=INFO