From cd85eb8b0b82c4bbac0cfcd677a346a3d97ebca8 Mon Sep 17 00:00:00 2001 From: panos-kakos <102670093+panos-kakos@users.noreply.github.com> Date: Wed, 13 Dec 2023 22:04:35 +0200 Subject: [PATCH] [JAVA-27620] (#15396) * [JAVA-27620] * [JAVA-27620] * [JAVA-27620] Comment spring-boot-3-2 module --- spring-boot-modules/pom.xml | 2 +- spring-boot-modules/spring-boot-3-2/README.md | 2 ++ spring-boot-modules/spring-boot-3-2/pom.xml | 1 + .../main/java/com/baeldung/restclient/Article.java | 0 .../com/baeldung/restclient/ArticleController.java | 13 ++++++++++--- .../restclient/ArticleNotFoundException.java | 0 .../InvalidArticleResponseException.java | 0 .../baeldung/restclient/RestClientApplication.java | 0 .../restclient/RestClientIntegrationTest.java | 14 +++++++------- spring-boot-modules/spring-boot-3/README.md | 3 ++- 10 files changed, 23 insertions(+), 12 deletions(-) rename spring-boot-modules/{spring-boot-3 => spring-boot-3-2}/src/main/java/com/baeldung/restclient/Article.java (100%) rename spring-boot-modules/{spring-boot-3 => spring-boot-3-2}/src/main/java/com/baeldung/restclient/ArticleController.java (75%) rename spring-boot-modules/{spring-boot-3 => spring-boot-3-2}/src/main/java/com/baeldung/restclient/ArticleNotFoundException.java (100%) rename spring-boot-modules/{spring-boot-3 => spring-boot-3-2}/src/main/java/com/baeldung/restclient/InvalidArticleResponseException.java (100%) rename spring-boot-modules/{spring-boot-3 => spring-boot-3-2}/src/main/java/com/baeldung/restclient/RestClientApplication.java (100%) rename spring-boot-modules/{spring-boot-3 => spring-boot-3-2}/src/test/java/com/baeldung/restclient/RestClientIntegrationTest.java (100%) diff --git a/spring-boot-modules/pom.xml b/spring-boot-modules/pom.xml index eaf04cf015..890edd6cc5 100644 --- a/spring-boot-modules/pom.xml +++ b/spring-boot-modules/pom.xml @@ -95,7 +95,7 @@ spring-boot-3-observation spring-boot-3-test-pitfalls spring-boot-3-testcontainers - spring-boot-3-2 + spring-boot-resilience4j spring-boot-properties spring-boot-properties-2 diff --git a/spring-boot-modules/spring-boot-3-2/README.md b/spring-boot-modules/spring-boot-3-2/README.md index 27f9281725..b461cd9913 100644 --- a/spring-boot-modules/spring-boot-3-2/README.md +++ b/spring-boot-modules/spring-boot-3-2/README.md @@ -1,3 +1,5 @@ ## Relevant Articles - [Spring Boot 3.1’s ConnectionDetails Abstraction](https://www.baeldung.com/spring-boot-3-1-connectiondetails-abstraction) - [@ConditionalOnThreading Annotation Spring](https://www.baeldung.com/spring-conditionalonthreading) +- [A Guide to RestClient in Spring Boot](https://www.baeldung.com/spring-boot-restclient) +- More articles: [[<-- prev]](/spring-boot-modules/spring-boot-3) \ No newline at end of file diff --git a/spring-boot-modules/spring-boot-3-2/pom.xml b/spring-boot-modules/spring-boot-3-2/pom.xml index e48b232a52..8878060a97 100644 --- a/spring-boot-modules/spring-boot-3-2/pom.xml +++ b/spring-boot-modules/spring-boot-3-2/pom.xml @@ -282,6 +282,7 @@ + com.baeldung.restclient.RestClientApplication 1.6.0.Beta1 2.0.0 3.0.0-M7 diff --git a/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/restclient/Article.java b/spring-boot-modules/spring-boot-3-2/src/main/java/com/baeldung/restclient/Article.java similarity index 100% rename from spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/restclient/Article.java rename to spring-boot-modules/spring-boot-3-2/src/main/java/com/baeldung/restclient/Article.java diff --git a/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/restclient/ArticleController.java b/spring-boot-modules/spring-boot-3-2/src/main/java/com/baeldung/restclient/ArticleController.java similarity index 75% rename from spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/restclient/ArticleController.java rename to spring-boot-modules/spring-boot-3-2/src/main/java/com/baeldung/restclient/ArticleController.java index 5e1dff6fd7..c2d87a558c 100644 --- a/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/restclient/ArticleController.java +++ b/spring-boot-modules/spring-boot-3-2/src/main/java/com/baeldung/restclient/ArticleController.java @@ -1,13 +1,20 @@ package com.baeldung.restclient; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - import java.util.Collection; import java.util.HashMap; import java.util.Map; import java.util.Objects; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + @RestController @RequestMapping("/articles") public class ArticleController { diff --git a/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/restclient/ArticleNotFoundException.java b/spring-boot-modules/spring-boot-3-2/src/main/java/com/baeldung/restclient/ArticleNotFoundException.java similarity index 100% rename from spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/restclient/ArticleNotFoundException.java rename to spring-boot-modules/spring-boot-3-2/src/main/java/com/baeldung/restclient/ArticleNotFoundException.java diff --git a/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/restclient/InvalidArticleResponseException.java b/spring-boot-modules/spring-boot-3-2/src/main/java/com/baeldung/restclient/InvalidArticleResponseException.java similarity index 100% rename from spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/restclient/InvalidArticleResponseException.java rename to spring-boot-modules/spring-boot-3-2/src/main/java/com/baeldung/restclient/InvalidArticleResponseException.java diff --git a/spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/restclient/RestClientApplication.java b/spring-boot-modules/spring-boot-3-2/src/main/java/com/baeldung/restclient/RestClientApplication.java similarity index 100% rename from spring-boot-modules/spring-boot-3/src/main/java/com/baeldung/restclient/RestClientApplication.java rename to spring-boot-modules/spring-boot-3-2/src/main/java/com/baeldung/restclient/RestClientApplication.java diff --git a/spring-boot-modules/spring-boot-3/src/test/java/com/baeldung/restclient/RestClientIntegrationTest.java b/spring-boot-modules/spring-boot-3-2/src/test/java/com/baeldung/restclient/RestClientIntegrationTest.java similarity index 100% rename from spring-boot-modules/spring-boot-3/src/test/java/com/baeldung/restclient/RestClientIntegrationTest.java rename to spring-boot-modules/spring-boot-3-2/src/test/java/com/baeldung/restclient/RestClientIntegrationTest.java index 1a615faf4e..3e12215bcb 100644 --- a/spring-boot-modules/spring-boot-3/src/test/java/com/baeldung/restclient/RestClientIntegrationTest.java +++ b/spring-boot-modules/spring-boot-3-2/src/test/java/com/baeldung/restclient/RestClientIntegrationTest.java @@ -1,7 +1,10 @@ package com.baeldung.restclient; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +import java.util.List; + import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -14,11 +17,8 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.web.client.RestClient; -import java.util.List; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; - +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class RestClientIntegrationTest { diff --git a/spring-boot-modules/spring-boot-3/README.md b/spring-boot-modules/spring-boot-3/README.md index ded5db30e4..ff00a506cf 100644 --- a/spring-boot-modules/spring-boot-3/README.md +++ b/spring-boot-modules/spring-boot-3/README.md @@ -8,4 +8,5 @@ - [HTTP Interface in Spring 6](https://www.baeldung.com/spring-6-http-interface) - [Working with Virtual Threads in Spring 6](https://www.baeldung.com/spring-6-virtual-threads) - [Docker Compose Support in Spring Boot 3](https://www.baeldung.com/ops/docker-compose-support-spring-boot) -- [A Guide to RestClient in Spring Boot](https://www.baeldung.com/spring-boot-restclient) + +- More articles: [[next -->]](/spring-boot-modules/spring-boot-3-2)