From 08433b16312362c427647daedfb1a1c9410ab0f3 Mon Sep 17 00:00:00 2001 From: Amy DeGregorio Date: Sun, 19 Dec 2021 14:53:05 -0500 Subject: [PATCH] BAEL-4811 (#11597) * BAEL-4811 * BAEL-4811 Add unit tests * JAVA-8794: Upgrade Spring Boot to 2.6.1 in the parent-boot-2 * JAVA-8794: Upgrade spring-mybatis dependencies * JAVA-8794: Make spring-boot-springdoc 2.6 compatible * JAVA-8794: Add spring.mongodb.embedded.version property * JAVA-8794: Upgrade spring-boot-environment cloud dependencies * JAVA-8794: Set spring.mvc.pathmatch.matching-strategy property * JAVA-8794: Update Spring Cloud dependencies * JAVA-8794: allow-circular-references in spring-cloud-ribbon-client * JAVA-8794: Replace deprecated ConfigFileApplicationContextInitializer * JAVA-8794: Fix spring-resttemplate pom * JAVA-8794: Use spring.mongodb.embedded.version=3.5.5 * JAVA-8794: Use spring.mongodb.embedded.version=3.5.5 * JAVA-8794: Fix circural dependencies in spring-security-web-boot-2 * JAVA-8794: Fix circural dependencies in spring-security-core * JAVA-8794: Fix quart schema initialization * JAVA-8794: Set spring.mvc.pathmatch.matching-strategy=ant-path-matcher * JAVA-8794: Leave spring-kafka on Spring Boot 2.5.4 * JAVA-8794: Set spring.mongodb.embedded.version=3.5.5 in spring-jenkins-pipeline * JAVA-8794: Update Spring Cloud version * JAVA-8794: Update spring-cloud-zuul dependencies * JAVA-8794: Update Spring Cloud version in spring-cloud-bus * JAVA-8794: Set spring.mongodb.embedded.version=3.5.5 in spring-boot-persistence-mongodb * JAVA-8794: Fix spring-data-jpa-query-2 dependencies * JAVA-8794: Fix circular dependency issue in spring-security-web-thymeleaf * JAVA-8794: Fix circular dependency issue in spring-session-redis * JAVA-8794: Fix circular dependency issue in spring-boot-libraries-2 * JAVA-8794: Update spring-cloud-starter version * JAVA-8794: Leave spring-zuul-rate-limiting on 2.4.7 * JAVA-8794: Ignore EnversFooBarAuditIntegrationTest * BAEL-4811 Fix formatting * BAEL-4811 Fix formatting Co-authored-by: Krzysiek Co-authored-by: Loredana Crusoveanu --- .../vs/springboot/CompareApplication.java | 2 +- .../springboot/client/ArithmeticClient.java | 28 +++--- .../client/ArithmeticClientImpl.java | 49 ++++++----- .../controller/ArithmeticController.java | 52 +++++------ .../springboot/service/ArithmeticService.java | 20 ++--- .../springboot/ArithmeticClientUnitTest.java | 36 ++++---- .../vs/springboot/CompareApplication.java | 2 +- .../controller/ArithmeticController.java | 3 +- .../springboot/service/ArithmeticService.java | 22 ++--- .../ArithmeticControllerUnitTest.java | 88 +++++++++---------- 10 files changed, 154 insertions(+), 148 deletions(-) diff --git a/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/CompareApplication.java b/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/CompareApplication.java index 3375c302c2..4654526b28 100644 --- a/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/CompareApplication.java +++ b/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/CompareApplication.java @@ -4,6 +4,6 @@ import io.micronaut.runtime.Micronaut; public class CompareApplication { public static void main(String[] args) { - Micronaut.run(CompareApplication.class); + Micronaut.run(CompareApplication.class); } } diff --git a/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/client/ArithmeticClient.java b/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/client/ArithmeticClient.java index eb314d8a1d..4d5c752215 100644 --- a/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/client/ArithmeticClient.java +++ b/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/client/ArithmeticClient.java @@ -6,18 +6,18 @@ import io.micronaut.http.client.annotation.Client; @Client("/math") public interface ArithmeticClient { - @Get("/sum/{number1}/{number2}") - String sum(float number1, float number2); - - @Get("/subtract/{number1}/{number2}") - String subtract(float number1, float number2); - - @Get("/multiply/{number1}/{number2}") - String multiply(float number1, float number2); - - @Get("/divide/{number1}/{number2}") - String divide(float number1, float number2); - - @Get("/memory") - String memory(); + @Get("/sum/{number1}/{number2}") + String sum(float number1, float number2); + + @Get("/subtract/{number1}/{number2}") + String subtract(float number1, float number2); + + @Get("/multiply/{number1}/{number2}") + String multiply(float number1, float number2); + + @Get("/divide/{number1}/{number2}") + String divide(float number1, float number2); + + @Get("/memory") + String memory(); } diff --git a/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/client/ArithmeticClientImpl.java b/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/client/ArithmeticClientImpl.java index 1a9cad7981..6b7ae900be 100644 --- a/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/client/ArithmeticClientImpl.java +++ b/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/client/ArithmeticClientImpl.java @@ -8,34 +8,39 @@ import io.micronaut.http.client.annotation.Client; @Singleton public class ArithmeticClientImpl { - private RxHttpClient httpClient; + private RxHttpClient httpClient; - public ArithmeticClientImpl(@Client("/") RxHttpClient httpClient) { - this.httpClient = httpClient; + public ArithmeticClientImpl(@Client("/") RxHttpClient httpClient) { + this.httpClient = httpClient; } public String sum(float number1, float number2) { - HttpRequest req = HttpRequest.GET("/math/sum/" + number1 + "/" + number2); - return httpClient.retrieve(req).blockingFirst(); - } - + HttpRequest req = HttpRequest.GET("/math/sum/" + number1 + "/" + number2); + return httpClient.retrieve(req) + .blockingFirst(); + } + public String subtract(float number1, float number2) { - HttpRequest req = HttpRequest.GET("/math/subtract/" + number1 + "/" + number2); - return httpClient.retrieve(req).blockingFirst(); - } - + HttpRequest req = HttpRequest.GET("/math/subtract/" + number1 + "/" + number2); + return httpClient.retrieve(req) + .blockingFirst(); + } + public String multiply(float number1, float number2) { - HttpRequest req = HttpRequest.GET("/math/multiply/" + number1 + "/" + number2); - return httpClient.retrieve(req).blockingFirst(); - } - + HttpRequest req = HttpRequest.GET("/math/multiply/" + number1 + "/" + number2); + return httpClient.retrieve(req) + .blockingFirst(); + } + public String divide(float number1, float number2) { - HttpRequest req = HttpRequest.GET("/math/divide/" + number1 + "/" + number2); - return httpClient.retrieve(req).blockingFirst(); - } - + HttpRequest req = HttpRequest.GET("/math/divide/" + number1 + "/" + number2); + return httpClient.retrieve(req) + .blockingFirst(); + } + public String memory() { - HttpRequest req = HttpRequest.GET("/math/memory"); - return httpClient.retrieve(req).blockingFirst(); - } + HttpRequest req = HttpRequest.GET("/math/memory"); + return httpClient.retrieve(req) + .blockingFirst(); + } } diff --git a/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/controller/ArithmeticController.java b/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/controller/ArithmeticController.java index 930bdba029..5bc0e865e1 100644 --- a/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/controller/ArithmeticController.java +++ b/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/controller/ArithmeticController.java @@ -14,45 +14,45 @@ import io.micronaut.http.annotation.Get; public class ArithmeticController { @Inject private ArithmeticService arithmeticService; - + @Get("/sum/{number1}/{number2}") public float getSum(float number1, float number2) { - return arithmeticService.add(number1, number2); + return arithmeticService.add(number1, number2); } - + @Get("/subtract/{number1}/{number2}") public float getDifference(float number1, float number2) { - return arithmeticService.subtract(number1, number2); + return arithmeticService.subtract(number1, number2); } - + @Get("/multiply/{number1}/{number2}") public float getMultiplication(float number1, float number2) { - return arithmeticService.multiply(number1, number2); + return arithmeticService.multiply(number1, number2); } - + @Get("/divide/{number1}/{number2}") public float getDivision(float number1, float number2) { - return arithmeticService.divide(number1, number2); + return arithmeticService.divide(number1, number2); } - + @Get("/memory") public String getMemoryStatus() { - MemoryMXBean memoryBean = ManagementFactory.getMemoryMXBean(); - String memoryStats = ""; - - String init = String.format("Initial: %.2f GB \n", - (double)memoryBean.getHeapMemoryUsage().getInit() /1073741824); - String usedHeap = String.format("Used: %.2f GB \n", - (double)memoryBean.getHeapMemoryUsage().getUsed() /1073741824); - String maxHeap = String.format("Max: %.2f GB \n", - (double)memoryBean.getHeapMemoryUsage().getMax() /1073741824); - String committed = String.format("Committed: %.2f GB \n", - (double)memoryBean.getHeapMemoryUsage().getCommitted() /1073741824); - memoryStats += init; - memoryStats += usedHeap; - memoryStats += maxHeap; - memoryStats += committed; - - return memoryStats; + MemoryMXBean memoryBean = ManagementFactory.getMemoryMXBean(); + String memoryStats = ""; + + String init = String.format("Initial: %.2f GB \n", (double) memoryBean.getHeapMemoryUsage() + .getInit() / 1073741824); + String usedHeap = String.format("Used: %.2f GB \n", (double) memoryBean.getHeapMemoryUsage() + .getUsed() / 1073741824); + String maxHeap = String.format("Max: %.2f GB \n", (double) memoryBean.getHeapMemoryUsage() + .getMax() / 1073741824); + String committed = String.format("Committed: %.2f GB \n", (double) memoryBean.getHeapMemoryUsage() + .getCommitted() / 1073741824); + memoryStats += init; + memoryStats += usedHeap; + memoryStats += maxHeap; + memoryStats += committed; + + return memoryStats; } } diff --git a/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/service/ArithmeticService.java b/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/service/ArithmeticService.java index 663f96b3b5..e0e4680495 100644 --- a/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/service/ArithmeticService.java +++ b/micronaut/src/main/java/com/baeldung/micronaut/vs/springboot/service/ArithmeticService.java @@ -5,21 +5,21 @@ import javax.inject.Singleton; @Singleton public class ArithmeticService { public float add(float number1, float number2) { - return number1 + number2; + return number1 + number2; } - + public float subtract(float number1, float number2) { - return number1 - number2; + return number1 - number2; } - + public float multiply(float number1, float number2) { - return number1 * number2; + return number1 * number2; } - + public float divide(float number1, float number2) { - if (number2 == 0) { - throw new IllegalArgumentException("'number2' cannot be zero"); - } - return number1 / number2; + if (number2 == 0) { + throw new IllegalArgumentException("'number2' cannot be zero"); + } + return number1 / number2; } } diff --git a/micronaut/src/test/java/com/baeldung/micronaut/vs/springboot/ArithmeticClientUnitTest.java b/micronaut/src/test/java/com/baeldung/micronaut/vs/springboot/ArithmeticClientUnitTest.java index abf10d6f5e..9a1b095d22 100644 --- a/micronaut/src/test/java/com/baeldung/micronaut/vs/springboot/ArithmeticClientUnitTest.java +++ b/micronaut/src/test/java/com/baeldung/micronaut/vs/springboot/ArithmeticClientUnitTest.java @@ -13,49 +13,49 @@ import org.junit.Test; import com.baeldung.micronaut.vs.springboot.client.ArithmeticClientImpl; - public class ArithmeticClientUnitTest { - private EmbeddedServer server; + private EmbeddedServer server; private ArithmeticClientImpl client; @Before public void setup() { server = ApplicationContext.run(EmbeddedServer.class); - client = server.getApplicationContext().getBean(ArithmeticClientImpl.class); + client = server.getApplicationContext() + .getBean(ArithmeticClientImpl.class); } @After public void cleanup() { server.stop(); } - + @Test public void givenTwoNumbers_whenAdd_thenCorrectAnswerReturned() { - String expected = Float.valueOf(10 + 20).toString(); - assertEquals(expected, client.sum(10, 20)); + String expected = Float.valueOf(10 + 20).toString(); + assertEquals(expected, client.sum(10, 20)); } - + @Test public void givenTwoNumbers_whenSubtract_thenCorrectAnswerReturned() { - String expected = Float.valueOf(20 - 10).toString(); - assertEquals(expected, client.subtract(20, 10)); + String expected = Float.valueOf(20 - 10).toString(); + assertEquals(expected, client.subtract(20, 10)); } - + @Test public void givenTwoNumbers_whenMultiply_thenCorrectAnswerReturned() { - String expected = Float.valueOf(10 * 20).toString(); - assertEquals(expected, client.multiply(10, 20)); + String expected = Float.valueOf(10 * 20).toString(); + assertEquals(expected, client.multiply(10, 20)); } - + @Test public void givenTwoNumbers_whenDivide_thenCorrectAnswerReturned() { - String expected = Float.valueOf(30 / 10).toString(); - assertEquals(expected, client.divide(30, 10)); + String expected = Float.valueOf(30 / 10).toString(); + assertEquals(expected, client.divide(30, 10)); } - + @Test public void whenMemory_thenCorrectAnswerReturned() { - String expected = "Initial:"; - assertThat(client.memory(), containsString(expected)); + String expected = "Initial:"; + assertThat(client.memory(), containsString(expected)); } } diff --git a/spring-boot-modules/spring-boot-mvc-3/src/main/java/com/baeldung/micronaut/vs/springboot/CompareApplication.java b/spring-boot-modules/spring-boot-mvc-3/src/main/java/com/baeldung/micronaut/vs/springboot/CompareApplication.java index 5bf1e0a57c..14908ae108 100644 --- a/spring-boot-modules/spring-boot-mvc-3/src/main/java/com/baeldung/micronaut/vs/springboot/CompareApplication.java +++ b/spring-boot-modules/spring-boot-mvc-3/src/main/java/com/baeldung/micronaut/vs/springboot/CompareApplication.java @@ -7,7 +7,7 @@ import org.springframework.context.annotation.ComponentScan; @EnableAutoConfiguration @ComponentScan("com.baeldung.micronaut.vs.springboot") public class CompareApplication { - public static void main(final String[] args) { + public static void main(final String[] args) { SpringApplication.run(CompareApplication.class, args); } } diff --git a/spring-boot-modules/spring-boot-mvc-3/src/main/java/com/baeldung/micronaut/vs/springboot/controller/ArithmeticController.java b/spring-boot-modules/spring-boot-mvc-3/src/main/java/com/baeldung/micronaut/vs/springboot/controller/ArithmeticController.java index 2bb8046f66..54b2680dca 100644 --- a/spring-boot-modules/spring-boot-mvc-3/src/main/java/com/baeldung/micronaut/vs/springboot/controller/ArithmeticController.java +++ b/spring-boot-modules/spring-boot-mvc-3/src/main/java/com/baeldung/micronaut/vs/springboot/controller/ArithmeticController.java @@ -42,7 +42,8 @@ public class ArithmeticController { MemoryMXBean memoryBean = ManagementFactory.getMemoryMXBean(); String memoryStats = ""; - String init = String.format("Initial: %.2f GB \n", + String init = String.format( + "Initial: %.2f GB \n", (double)memoryBean.getHeapMemoryUsage().getInit() /1073741824); String usedHeap = String.format("Used: %.2f GB \n", (double)memoryBean.getHeapMemoryUsage().getUsed() /1073741824); diff --git a/spring-boot-modules/spring-boot-mvc-3/src/main/java/com/baeldung/micronaut/vs/springboot/service/ArithmeticService.java b/spring-boot-modules/spring-boot-mvc-3/src/main/java/com/baeldung/micronaut/vs/springboot/service/ArithmeticService.java index 485cfd4d8c..0ed84b63c5 100644 --- a/spring-boot-modules/spring-boot-mvc-3/src/main/java/com/baeldung/micronaut/vs/springboot/service/ArithmeticService.java +++ b/spring-boot-modules/spring-boot-mvc-3/src/main/java/com/baeldung/micronaut/vs/springboot/service/ArithmeticService.java @@ -4,22 +4,22 @@ import org.springframework.stereotype.Service; @Service public class ArithmeticService { - public float add(float number1, float number2) { - return number1 + number2; + public float add(float number1, float number2) { + return number1 + number2; } - + public float subtract(float number1, float number2) { - return number1 - number2; + return number1 - number2; } - + public float multiply(float number1, float number2) { - return number1 * number2; + return number1 * number2; } - + public float divide(float number1, float number2) { - if (number2 == 0) { - throw new IllegalArgumentException("'number2' cannot be zero"); - } - return number1 / number2; + if (number2 == 0) { + throw new IllegalArgumentException("'number2' cannot be zero"); + } + return number1 / number2; } } diff --git a/spring-boot-modules/spring-boot-mvc-3/src/test/java/com/baeldung/micronaut/vs/springboot/controller/ArithmeticControllerUnitTest.java b/spring-boot-modules/spring-boot-mvc-3/src/test/java/com/baeldung/micronaut/vs/springboot/controller/ArithmeticControllerUnitTest.java index 8734faef54..6b08bfbd9c 100644 --- a/spring-boot-modules/spring-boot-mvc-3/src/test/java/com/baeldung/micronaut/vs/springboot/controller/ArithmeticControllerUnitTest.java +++ b/spring-boot-modules/spring-boot-mvc-3/src/test/java/com/baeldung/micronaut/vs/springboot/controller/ArithmeticControllerUnitTest.java @@ -19,50 +19,50 @@ import com.baeldung.micronaut.vs.springboot.CompareApplication; @SpringBootTest(classes = CompareApplication.class) @AutoConfigureMockMvc public class ArithmeticControllerUnitTest { - @Autowired + @Autowired private MockMvc mockMvc; - - @Test - public void givenTwoNumbers_whenAdd_thenCorrectAnswerReturned() throws Exception { - Float expected = Float.valueOf(10 + 20); - this.mockMvc.perform(MockMvcRequestBuilders.get("/math/sum/10/20") - .accept(MediaType.APPLICATION_JSON)) - .andExpect(status().isOk()) - .andExpect(content().string(expected.toString())); - } - - @Test - public void givenTwoNumbers_whenSubtract_thenCorrectAnswerReturned() throws Exception { - Float expected = Float.valueOf(20 - 10); - this.mockMvc.perform(MockMvcRequestBuilders.get("/math/subtract/20/10") - .accept(MediaType.APPLICATION_JSON)) - .andExpect(status().isOk()) - .andExpect(content().string(expected.toString())); - } - @Test - public void givenTwoNumbers_whenMultiply_thenCorrectAnswerReturned() throws Exception { - Float expected = Float.valueOf(20 * 10); - this.mockMvc.perform(MockMvcRequestBuilders.get("/math/multiply/20/10") - .accept(MediaType.APPLICATION_JSON)) - .andExpect(status().isOk()) - .andExpect(content().string(expected.toString())); - } - - @Test - public void givenTwoNumbers_whenDivide_thenCorrectAnswerReturned() throws Exception { - Float expected = Float.valueOf(20 / 10); - this.mockMvc.perform(MockMvcRequestBuilders.get("/math/divide/20/10") - .accept(MediaType.APPLICATION_JSON)) - .andExpect(status().isOk()) - .andExpect(content().string(expected.toString())); - } - - @Test - public void whenMemory_thenMemoryStringReturned() throws Exception { - this.mockMvc.perform(MockMvcRequestBuilders.get("/math/memory") - .accept(MediaType.APPLICATION_JSON)) - .andExpect(status().isOk()) - .andExpect(content().string(containsString("Initial:"))); - } + @Test + public void givenTwoNumbers_whenAdd_thenCorrectAnswerReturned() throws Exception { + Float expected = Float.valueOf(10 + 20); + this.mockMvc.perform(MockMvcRequestBuilders.get("/math/sum/10/20") + .accept(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()) + .andExpect(content().string(expected.toString())); + } + + @Test + public void givenTwoNumbers_whenSubtract_thenCorrectAnswerReturned() throws Exception { + Float expected = Float.valueOf(20 - 10); + this.mockMvc.perform(MockMvcRequestBuilders.get("/math/subtract/20/10") + .accept(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()) + .andExpect(content().string(expected.toString())); + } + + @Test + public void givenTwoNumbers_whenMultiply_thenCorrectAnswerReturned() throws Exception { + Float expected = Float.valueOf(20 * 10); + this.mockMvc.perform(MockMvcRequestBuilders.get("/math/multiply/20/10") + .accept(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()) + .andExpect(content().string(expected.toString())); + } + + @Test + public void givenTwoNumbers_whenDivide_thenCorrectAnswerReturned() throws Exception { + Float expected = Float.valueOf(20 / 10); + this.mockMvc.perform(MockMvcRequestBuilders.get("/math/divide/20/10") + .accept(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()) + .andExpect(content().string(expected.toString())); + } + + @Test + public void whenMemory_thenMemoryStringReturned() throws Exception { + this.mockMvc.perform(MockMvcRequestBuilders.get("/math/memory") + .accept(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()) + .andExpect(content().string(containsString("Initial:"))); + } }