From 10eb6d4809c5a92a7ff41269695f2d8513ce4aec Mon Sep 17 00:00:00 2001 From: anair-it Date: Thu, 31 Oct 2019 10:51:48 -0400 Subject: [PATCH] JDK 11 compatible --- README.md | 5 ++ anair-parent-pom/pom.xml | 68 +++++++------------ .../resources/archetype-resources/Dockerfile | 2 +- anair-service-a/Dockerfile | 2 +- .../a/controller/ServiceARestController.java | 1 + .../ServiceARestControllerTest.java | 8 +-- anair-service-admin/Dockerfile | 2 +- anair-service-b/Dockerfile | 2 +- anair-service-c/Dockerfile | 2 +- 9 files changed, 41 insertions(+), 51 deletions(-) diff --git a/README.md b/README.md index 8b60a27..3733ffe 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,11 @@ Spring-boot based Microservice platform with - Distributed tracing ([Jaeger](https://www.jaegertracing.io/)) - Metrics collection and visualization ([Prometheus](https://prometheus.io/), [Loki](https://grafana.com/oss/loki/), [Grafana](https://grafana.com/)) +# Pre-requisite +- JDK 11 compiler +- Docker > 1.18 (Docker desktop on Windows and MacOS will work) +- Docker compose (latest version. Comes with Docker desktop) + # Understanding components in this project ## Spring boot parent pom (anair-parent-pom) - anair-parent-pom is the parent pom that manages commonly used dependencies and plugins. diff --git a/anair-parent-pom/pom.xml b/anair-parent-pom/pom.xml index 3b990d9..964ab06 100644 --- a/anair-parent-pom/pom.xml +++ b/anair-parent-pom/pom.xml @@ -26,9 +26,11 @@ UTF-8 - 1.8 + 11 + ${java.version} + ${java.version} - 2.1.8.RELEASE + 2.2.0.RELEASE 2.6 3.9 @@ -37,8 +39,9 @@ 2.9.2 3.4.1 2.1.6 + 7.2 - 0.8.4 + 0.8.5 0.31.0 1.0.22.RELEASE @@ -230,6 +233,9 @@ **/*IntegTest.java **/*IntegrationTest.java + + --illegal-access=permit + @@ -241,45 +247,9 @@ **/*IntegTest **/*IntegrationTest - - - - io.github.swagger2markup - swagger2markup-maven-plugin - 1.3.7 - - ${project.build.directory}/generated-sources/swagger.json - ${swagger.output.dir} - - ASCIIDOC - - - - - org.asciidoctor - asciidoctor-maven-plugin - 1.5.6 - - - org.asciidoctor - asciidoctorj-pdf - 1.5.0-alpha.18 - - - org.jruby - jruby-complete - 9.2.7.0 - - - - anair.adoc - ${project.build.directory}/swaggerreport - - book - left - 3 - ${swagger.output.dir} - + + --illegal-access=permit + @@ -359,6 +329,20 @@ + + org.apache.maven.plugins + maven-compiler-plugin + + ${java.version} + + + + org.ow2.asm + asm + ${asm.version} + + + diff --git a/anair-rest-archetype/src/main/resources/archetype-resources/Dockerfile b/anair-rest-archetype/src/main/resources/archetype-resources/Dockerfile index 967f414..537b22a 100644 --- a/anair-rest-archetype/src/main/resources/archetype-resources/Dockerfile +++ b/anair-rest-archetype/src/main/resources/archetype-resources/Dockerfile @@ -1,7 +1,7 @@ #set( $symbol_pound = '#' ) #set( $symbol_dollar = '$' ) #set( $symbol_escape = '\' ) -FROM openjdk:8-jre-alpine +FROM adoptopenjdk/openjdk11:alpine-jre LABEL maintainer="Anoop Nair" diff --git a/anair-service-a/Dockerfile b/anair-service-a/Dockerfile index d8cceb6..68f4c4c 100644 --- a/anair-service-a/Dockerfile +++ b/anair-service-a/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:8-jre-alpine +FROM adoptopenjdk/openjdk11:alpine-jre LABEL maintainer="Anoop Nair" diff --git a/anair-service-a/src/main/java/org/anair/services/a/controller/ServiceARestController.java b/anair-service-a/src/main/java/org/anair/services/a/controller/ServiceARestController.java index 091033b..050794a 100644 --- a/anair-service-a/src/main/java/org/anair/services/a/controller/ServiceARestController.java +++ b/anair-service-a/src/main/java/org/anair/services/a/controller/ServiceARestController.java @@ -63,6 +63,7 @@ public ResponseEntity echo(@RequestHeader final HttpHeaders headers, @Ap public ResponseEntity publish(@ApiParam(value = "userId", required = true) @NotBlank @PathVariable("userId") final String userId) { publishService.publish(userId); ResponseEntity book = protoRestTemplate.getForEntity(baseurlServiceC+"/book/1", Books.Book.class); + if(book.getStatusCode().is2xxSuccessful()){ logger.info("Received book for id: 1 -> {}", book.getBody().toString()); return ResponseEntity.status(HttpStatus.OK).body(book.toString()); diff --git a/anair-service-a/src/test/java/org/anair/services/a/controller/ServiceARestControllerTest.java b/anair-service-a/src/test/java/org/anair/services/a/controller/ServiceARestControllerTest.java index ea5aa4c..d175e1a 100644 --- a/anair-service-a/src/test/java/org/anair/services/a/controller/ServiceARestControllerTest.java +++ b/anair-service-a/src/test/java/org/anair/services/a/controller/ServiceARestControllerTest.java @@ -57,14 +57,14 @@ public void publish_200() throws Exception { .setLastName("lname1")) .build(); Mockito.when(bookEntity.getBody()).thenReturn(book); - Mockito.when(restTemplate.getForEntity("http://localhost:8082/anair-service-c/book/1", Books.Book.class)).thenReturn(bookEntity); + Mockito.when(restTemplate.getForEntity("http://localhost:8083/anair-service-c/book/1", Books.Book.class)).thenReturn(bookEntity); mockMvc.perform(get("/publish/anair")) .andExpect(status().isOk()) .andReturn(); Mockito.verify(publishService).publish("anair"); - Mockito.verify(restTemplate).getForEntity("http://localhost:8082/anair-service-c/book/1", Books.Book.class); + Mockito.verify(restTemplate).getForEntity("http://localhost:8083/anair-service-c/book/1", Books.Book.class); Mockito.verify(bookEntity).getStatusCode(); Mockito.verify(bookEntity).getBody(); } @@ -83,14 +83,14 @@ public void publish_grpc_error_500() throws Exception { ResponseEntity bookEntity = Mockito.mock(ResponseEntity.class); Mockito.doNothing().when(publishService).publish("anair"); Mockito.when(bookEntity.getStatusCode()).thenReturn(HttpStatus.INTERNAL_SERVER_ERROR); - Mockito.when(restTemplate.getForEntity("http://localhost:8082/anair-service-c/book/1", Books.Book.class)).thenReturn(bookEntity); + Mockito.when(restTemplate.getForEntity("http://localhost:8083/anair-service-c/book/1", Books.Book.class)).thenReturn(bookEntity); mockMvc.perform(get("/publish/anair")) .andExpect(status().is5xxServerError()) .andReturn(); Mockito.verify(publishService).publish("anair"); - Mockito.verify(restTemplate).getForEntity("http://localhost:8082/anair-service-c/book/1", Books.Book.class); + Mockito.verify(restTemplate).getForEntity("http://localhost:8083/anair-service-c/book/1", Books.Book.class); Mockito.verify(bookEntity).getStatusCode(); } diff --git a/anair-service-admin/Dockerfile b/anair-service-admin/Dockerfile index cd1bb69..b4d7722 100644 --- a/anair-service-admin/Dockerfile +++ b/anair-service-admin/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:8-jre-alpine +FROM adoptopenjdk/openjdk11:alpine-jre LABEL maintainer="Anoop Nair" diff --git a/anair-service-b/Dockerfile b/anair-service-b/Dockerfile index 6b69d2e..16ad1ec 100644 --- a/anair-service-b/Dockerfile +++ b/anair-service-b/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:8-jre-alpine +FROM adoptopenjdk/openjdk11:alpine-jre LABEL maintainer="Anoop Nair" diff --git a/anair-service-c/Dockerfile b/anair-service-c/Dockerfile index ec4bd7e..7080d4d 100644 --- a/anair-service-c/Dockerfile +++ b/anair-service-c/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:8-jre-alpine +FROM adoptopenjdk/openjdk11:alpine-jre LABEL maintainer="Anoop Nair"