From c23f0d6b1fe031f2b6477befb60c45536c3fe5ad Mon Sep 17 00:00:00 2001 From: panos-kakos <102670093+panos-kakos@users.noreply.github.com> Date: Wed, 22 Nov 2023 10:28:23 +0000 Subject: [PATCH] =?UTF-8?q?[JAVA-26374-spring-resttemplate]=20Moved=20"Res?= =?UTF-8?q?tTemplate=20Post=20Request=20wit=E2=80=A6=20(#15104)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [JAVA-26374-spring-resttemplate] Moved "RestTemplate Post Request with JSON" to spring-resttemplate-1 * [JAVA-26374] Moved "Get and Post Lists of Objects with RestTemplate" article to spring-resttemplate-1 --- spring-web-modules/pom.xml | 1 + .../spring-resttemplate-1/README.md | 7 +++++ .../spring-resttemplate-1/pom.xml | 30 +++++++++++++++++++ .../resttemplate/RestTemplateApplication.java | 0 .../RestTemplateConfigurationApplication.java | 0 .../lists/EmployeeApplication.java | 0 .../lists/client/EmployeeClient.java | 13 ++++---- .../lists/controller/EmployeeResource.java | 4 +-- .../resttemplate/lists/dto/Employee.java | 0 .../resttemplate/lists/dto/EmployeeList.java | 0 .../lists/service/EmployeeService.java | 6 ++-- .../web/controller/PersonAPI.java | 0 .../baeldung/resttemplate/web/dto/Person.java | 0 .../web/service/PersonService.java | 0 .../web/service/PersonServiceImpl.java | 0 .../src/main/resources/application.properties | 2 ++ .../postjson/PersonAPILiveTest.java | 0 ...stTemplatePostRequestEncodingLiveTest.java | 0 .../src/test/resources/application.properties | 5 ++++ .../src/test/resources/logback-test.xml | 12 ++++++++ .../spring-resttemplate-2/README.md | 1 - .../spring-resttemplate-3/README.md | 1 - 22 files changed, 69 insertions(+), 13 deletions(-) create mode 100644 spring-web-modules/spring-resttemplate-1/README.md create mode 100644 spring-web-modules/spring-resttemplate-1/pom.xml rename spring-web-modules/{spring-resttemplate-2 => spring-resttemplate-1}/src/main/java/com/baeldung/resttemplate/RestTemplateApplication.java (100%) rename spring-web-modules/{spring-resttemplate-2 => spring-resttemplate-1}/src/main/java/com/baeldung/resttemplate/RestTemplateConfigurationApplication.java (100%) rename spring-web-modules/{spring-resttemplate-3 => spring-resttemplate-1}/src/main/java/com/baeldung/resttemplate/lists/EmployeeApplication.java (100%) rename spring-web-modules/{spring-resttemplate-3 => spring-resttemplate-1}/src/main/java/com/baeldung/resttemplate/lists/client/EmployeeClient.java (99%) rename spring-web-modules/{spring-resttemplate-3 => spring-resttemplate-1}/src/main/java/com/baeldung/resttemplate/lists/controller/EmployeeResource.java (100%) rename spring-web-modules/{spring-resttemplate-3 => spring-resttemplate-1}/src/main/java/com/baeldung/resttemplate/lists/dto/Employee.java (100%) rename spring-web-modules/{spring-resttemplate-3 => spring-resttemplate-1}/src/main/java/com/baeldung/resttemplate/lists/dto/EmployeeList.java (100%) rename spring-web-modules/{spring-resttemplate-3 => spring-resttemplate-1}/src/main/java/com/baeldung/resttemplate/lists/service/EmployeeService.java (100%) rename spring-web-modules/{spring-resttemplate-2 => spring-resttemplate-1}/src/main/java/com/baeldung/resttemplate/web/controller/PersonAPI.java (100%) rename spring-web-modules/{spring-resttemplate-2 => spring-resttemplate-1}/src/main/java/com/baeldung/resttemplate/web/dto/Person.java (100%) rename spring-web-modules/{spring-resttemplate-2 => spring-resttemplate-1}/src/main/java/com/baeldung/resttemplate/web/service/PersonService.java (100%) rename spring-web-modules/{spring-resttemplate-2 => spring-resttemplate-1}/src/main/java/com/baeldung/resttemplate/web/service/PersonServiceImpl.java (100%) create mode 100644 spring-web-modules/spring-resttemplate-1/src/main/resources/application.properties rename spring-web-modules/{spring-resttemplate-2 => spring-resttemplate-1}/src/test/java/com/baeldung/resttemplate/postjson/PersonAPILiveTest.java (100%) rename spring-web-modules/{spring-resttemplate-2 => spring-resttemplate-1}/src/test/java/com/baeldung/resttemplate/postjson/RestTemplatePostRequestEncodingLiveTest.java (100%) create mode 100644 spring-web-modules/spring-resttemplate-1/src/test/resources/application.properties create mode 100644 spring-web-modules/spring-resttemplate-1/src/test/resources/logback-test.xml diff --git a/spring-web-modules/pom.xml b/spring-web-modules/pom.xml index 2be896ad83..87bcfaa203 100644 --- a/spring-web-modules/pom.xml +++ b/spring-web-modules/pom.xml @@ -44,6 +44,7 @@ spring-rest-simple spring-rest-testing spring-resttemplate + spring-resttemplate-1 spring-resttemplate-2 spring-resttemplate-3 spring-session diff --git a/spring-web-modules/spring-resttemplate-1/README.md b/spring-web-modules/spring-resttemplate-1/README.md new file mode 100644 index 0000000000..d5cf69e86a --- /dev/null +++ b/spring-web-modules/spring-resttemplate-1/README.md @@ -0,0 +1,7 @@ +## Spring RestTemplate + +This module contains articles about Spring RestTemplate + +### Relevant Articles: +- [RestTemplate Post Request with JSON](https://www.baeldung.com/spring-resttemplate-post-json) +- [Get and Post Lists of Objects with RestTemplate](https://www.baeldung.com/spring-rest-template-list) diff --git a/spring-web-modules/spring-resttemplate-1/pom.xml b/spring-web-modules/spring-resttemplate-1/pom.xml new file mode 100644 index 0000000000..209c941ede --- /dev/null +++ b/spring-web-modules/spring-resttemplate-1/pom.xml @@ -0,0 +1,30 @@ + + + 4.0.0 + spring-resttemplate-1 + 0.1-SNAPSHOT + spring-resttemplate-1 + war + + + com.baeldung + parent-boot-2 + 0.0.1-SNAPSHOT + ../../parent-boot-2 + + + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-test + + + + \ No newline at end of file diff --git a/spring-web-modules/spring-resttemplate-2/src/main/java/com/baeldung/resttemplate/RestTemplateApplication.java b/spring-web-modules/spring-resttemplate-1/src/main/java/com/baeldung/resttemplate/RestTemplateApplication.java similarity index 100% rename from spring-web-modules/spring-resttemplate-2/src/main/java/com/baeldung/resttemplate/RestTemplateApplication.java rename to spring-web-modules/spring-resttemplate-1/src/main/java/com/baeldung/resttemplate/RestTemplateApplication.java diff --git a/spring-web-modules/spring-resttemplate-2/src/main/java/com/baeldung/resttemplate/RestTemplateConfigurationApplication.java b/spring-web-modules/spring-resttemplate-1/src/main/java/com/baeldung/resttemplate/RestTemplateConfigurationApplication.java similarity index 100% rename from spring-web-modules/spring-resttemplate-2/src/main/java/com/baeldung/resttemplate/RestTemplateConfigurationApplication.java rename to spring-web-modules/spring-resttemplate-1/src/main/java/com/baeldung/resttemplate/RestTemplateConfigurationApplication.java diff --git a/spring-web-modules/spring-resttemplate-3/src/main/java/com/baeldung/resttemplate/lists/EmployeeApplication.java b/spring-web-modules/spring-resttemplate-1/src/main/java/com/baeldung/resttemplate/lists/EmployeeApplication.java similarity index 100% rename from spring-web-modules/spring-resttemplate-3/src/main/java/com/baeldung/resttemplate/lists/EmployeeApplication.java rename to spring-web-modules/spring-resttemplate-1/src/main/java/com/baeldung/resttemplate/lists/EmployeeApplication.java diff --git a/spring-web-modules/spring-resttemplate-3/src/main/java/com/baeldung/resttemplate/lists/client/EmployeeClient.java b/spring-web-modules/spring-resttemplate-1/src/main/java/com/baeldung/resttemplate/lists/client/EmployeeClient.java similarity index 99% rename from spring-web-modules/spring-resttemplate-3/src/main/java/com/baeldung/resttemplate/lists/client/EmployeeClient.java rename to spring-web-modules/spring-resttemplate-1/src/main/java/com/baeldung/resttemplate/lists/client/EmployeeClient.java index 49e375f9cc..7fa0d55690 100644 --- a/spring-web-modules/spring-resttemplate-3/src/main/java/com/baeldung/resttemplate/lists/client/EmployeeClient.java +++ b/spring-web-modules/spring-resttemplate-1/src/main/java/com/baeldung/resttemplate/lists/client/EmployeeClient.java @@ -1,16 +1,17 @@ package com.baeldung.resttemplate.lists.client; -import com.baeldung.resttemplate.lists.dto.Employee; -import com.baeldung.resttemplate.lists.dto.EmployeeList; +import static java.util.Arrays.asList; + +import java.util.ArrayList; +import java.util.List; + import org.springframework.core.ParameterizedTypeReference; import org.springframework.http.HttpMethod; import org.springframework.http.ResponseEntity; import org.springframework.web.client.RestTemplate; -import java.util.ArrayList; -import java.util.List; - -import static java.util.Arrays.asList; +import com.baeldung.resttemplate.lists.dto.Employee; +import com.baeldung.resttemplate.lists.dto.EmployeeList; /** * Application that shows how to use Lists with RestTemplate. diff --git a/spring-web-modules/spring-resttemplate-3/src/main/java/com/baeldung/resttemplate/lists/controller/EmployeeResource.java b/spring-web-modules/spring-resttemplate-1/src/main/java/com/baeldung/resttemplate/lists/controller/EmployeeResource.java similarity index 100% rename from spring-web-modules/spring-resttemplate-3/src/main/java/com/baeldung/resttemplate/lists/controller/EmployeeResource.java rename to spring-web-modules/spring-resttemplate-1/src/main/java/com/baeldung/resttemplate/lists/controller/EmployeeResource.java index 8a4d510f63..1cd68f89b9 100644 --- a/spring-web-modules/spring-resttemplate-3/src/main/java/com/baeldung/resttemplate/lists/controller/EmployeeResource.java +++ b/spring-web-modules/spring-resttemplate-1/src/main/java/com/baeldung/resttemplate/lists/controller/EmployeeResource.java @@ -1,5 +1,7 @@ package com.baeldung.resttemplate.lists.controller; +import java.util.List; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -10,8 +12,6 @@ import com.baeldung.resttemplate.lists.dto.Employee; import com.baeldung.resttemplate.lists.dto.EmployeeList; import com.baeldung.resttemplate.lists.service.EmployeeService; -import java.util.List; - @RestController @RequestMapping("/employees") public class EmployeeResource diff --git a/spring-web-modules/spring-resttemplate-3/src/main/java/com/baeldung/resttemplate/lists/dto/Employee.java b/spring-web-modules/spring-resttemplate-1/src/main/java/com/baeldung/resttemplate/lists/dto/Employee.java similarity index 100% rename from spring-web-modules/spring-resttemplate-3/src/main/java/com/baeldung/resttemplate/lists/dto/Employee.java rename to spring-web-modules/spring-resttemplate-1/src/main/java/com/baeldung/resttemplate/lists/dto/Employee.java diff --git a/spring-web-modules/spring-resttemplate-3/src/main/java/com/baeldung/resttemplate/lists/dto/EmployeeList.java b/spring-web-modules/spring-resttemplate-1/src/main/java/com/baeldung/resttemplate/lists/dto/EmployeeList.java similarity index 100% rename from spring-web-modules/spring-resttemplate-3/src/main/java/com/baeldung/resttemplate/lists/dto/EmployeeList.java rename to spring-web-modules/spring-resttemplate-1/src/main/java/com/baeldung/resttemplate/lists/dto/EmployeeList.java diff --git a/spring-web-modules/spring-resttemplate-3/src/main/java/com/baeldung/resttemplate/lists/service/EmployeeService.java b/spring-web-modules/spring-resttemplate-1/src/main/java/com/baeldung/resttemplate/lists/service/EmployeeService.java similarity index 100% rename from spring-web-modules/spring-resttemplate-3/src/main/java/com/baeldung/resttemplate/lists/service/EmployeeService.java rename to spring-web-modules/spring-resttemplate-1/src/main/java/com/baeldung/resttemplate/lists/service/EmployeeService.java index 8a1773483a..a9ea3f373f 100644 --- a/spring-web-modules/spring-resttemplate-3/src/main/java/com/baeldung/resttemplate/lists/service/EmployeeService.java +++ b/spring-web-modules/spring-resttemplate-1/src/main/java/com/baeldung/resttemplate/lists/service/EmployeeService.java @@ -1,12 +1,12 @@ package com.baeldung.resttemplate.lists.service; +import java.util.ArrayList; +import java.util.List; + import org.springframework.stereotype.Service; import com.baeldung.resttemplate.lists.dto.Employee; -import java.util.ArrayList; -import java.util.List; - @Service("EmployeeListService") public class EmployeeService { diff --git a/spring-web-modules/spring-resttemplate-2/src/main/java/com/baeldung/resttemplate/web/controller/PersonAPI.java b/spring-web-modules/spring-resttemplate-1/src/main/java/com/baeldung/resttemplate/web/controller/PersonAPI.java similarity index 100% rename from spring-web-modules/spring-resttemplate-2/src/main/java/com/baeldung/resttemplate/web/controller/PersonAPI.java rename to spring-web-modules/spring-resttemplate-1/src/main/java/com/baeldung/resttemplate/web/controller/PersonAPI.java diff --git a/spring-web-modules/spring-resttemplate-2/src/main/java/com/baeldung/resttemplate/web/dto/Person.java b/spring-web-modules/spring-resttemplate-1/src/main/java/com/baeldung/resttemplate/web/dto/Person.java similarity index 100% rename from spring-web-modules/spring-resttemplate-2/src/main/java/com/baeldung/resttemplate/web/dto/Person.java rename to spring-web-modules/spring-resttemplate-1/src/main/java/com/baeldung/resttemplate/web/dto/Person.java diff --git a/spring-web-modules/spring-resttemplate-2/src/main/java/com/baeldung/resttemplate/web/service/PersonService.java b/spring-web-modules/spring-resttemplate-1/src/main/java/com/baeldung/resttemplate/web/service/PersonService.java similarity index 100% rename from spring-web-modules/spring-resttemplate-2/src/main/java/com/baeldung/resttemplate/web/service/PersonService.java rename to spring-web-modules/spring-resttemplate-1/src/main/java/com/baeldung/resttemplate/web/service/PersonService.java diff --git a/spring-web-modules/spring-resttemplate-2/src/main/java/com/baeldung/resttemplate/web/service/PersonServiceImpl.java b/spring-web-modules/spring-resttemplate-1/src/main/java/com/baeldung/resttemplate/web/service/PersonServiceImpl.java similarity index 100% rename from spring-web-modules/spring-resttemplate-2/src/main/java/com/baeldung/resttemplate/web/service/PersonServiceImpl.java rename to spring-web-modules/spring-resttemplate-1/src/main/java/com/baeldung/resttemplate/web/service/PersonServiceImpl.java diff --git a/spring-web-modules/spring-resttemplate-1/src/main/resources/application.properties b/spring-web-modules/spring-resttemplate-1/src/main/resources/application.properties new file mode 100644 index 0000000000..ea4f7c866d --- /dev/null +++ b/spring-web-modules/spring-resttemplate-1/src/main/resources/application.properties @@ -0,0 +1,2 @@ +server.port=8080 +server.servlet.context-path=/spring-rest \ No newline at end of file diff --git a/spring-web-modules/spring-resttemplate-2/src/test/java/com/baeldung/resttemplate/postjson/PersonAPILiveTest.java b/spring-web-modules/spring-resttemplate-1/src/test/java/com/baeldung/resttemplate/postjson/PersonAPILiveTest.java similarity index 100% rename from spring-web-modules/spring-resttemplate-2/src/test/java/com/baeldung/resttemplate/postjson/PersonAPILiveTest.java rename to spring-web-modules/spring-resttemplate-1/src/test/java/com/baeldung/resttemplate/postjson/PersonAPILiveTest.java diff --git a/spring-web-modules/spring-resttemplate-2/src/test/java/com/baeldung/resttemplate/postjson/RestTemplatePostRequestEncodingLiveTest.java b/spring-web-modules/spring-resttemplate-1/src/test/java/com/baeldung/resttemplate/postjson/RestTemplatePostRequestEncodingLiveTest.java similarity index 100% rename from spring-web-modules/spring-resttemplate-2/src/test/java/com/baeldung/resttemplate/postjson/RestTemplatePostRequestEncodingLiveTest.java rename to spring-web-modules/spring-resttemplate-1/src/test/java/com/baeldung/resttemplate/postjson/RestTemplatePostRequestEncodingLiveTest.java diff --git a/spring-web-modules/spring-resttemplate-1/src/test/resources/application.properties b/spring-web-modules/spring-resttemplate-1/src/test/resources/application.properties new file mode 100644 index 0000000000..286ea95a4f --- /dev/null +++ b/spring-web-modules/spring-resttemplate-1/src/test/resources/application.properties @@ -0,0 +1,5 @@ +logging.level.org.springframework.web.client.RestTemplate=DEBUG +logging.level.com.baeldung.resttemplate.logging=DEBUG +logging.level.org.apache.http=DEBUG +logging.level.httpclient.wire=DEBUG +logging.pattern.console=%20logger{20} - %msg%n diff --git a/spring-web-modules/spring-resttemplate-1/src/test/resources/logback-test.xml b/spring-web-modules/spring-resttemplate-1/src/test/resources/logback-test.xml new file mode 100644 index 0000000000..8d4771e308 --- /dev/null +++ b/spring-web-modules/spring-resttemplate-1/src/test/resources/logback-test.xml @@ -0,0 +1,12 @@ + + + + + [%d{ISO8601}]-[%thread] %-5level %logger - %msg%n + + + + + + + \ No newline at end of file diff --git a/spring-web-modules/spring-resttemplate-2/README.md b/spring-web-modules/spring-resttemplate-2/README.md index ace7ae817b..ad2a671040 100644 --- a/spring-web-modules/spring-resttemplate-2/README.md +++ b/spring-web-modules/spring-resttemplate-2/README.md @@ -7,7 +7,6 @@ This module contains articles about Spring RestTemplate - [Spring RestTemplate Request/Response Logging](https://www.baeldung.com/spring-resttemplate-logging) - [Proxies With RestTemplate](https://www.baeldung.com/java-resttemplate-proxy) - [A Custom Media Type for a Spring REST API](https://www.baeldung.com/spring-rest-custom-media-type) -- [RestTemplate Post Request with JSON](https://www.baeldung.com/spring-resttemplate-post-json) - [How to Compress Requests Using the Spring RestTemplate](https://www.baeldung.com/spring-resttemplate-compressing-requests) - [Get list of JSON objects with Spring RestTemplate](https://www.baeldung.com/spring-resttemplate-json-list) - [Spring RestTemplate Exception: “Not enough variables available to expand”](https://www.baeldung.com/spring-not-enough-variables-available) diff --git a/spring-web-modules/spring-resttemplate-3/README.md b/spring-web-modules/spring-resttemplate-3/README.md index f3cfb1d671..14aaf77b9e 100644 --- a/spring-web-modules/spring-resttemplate-3/README.md +++ b/spring-web-modules/spring-resttemplate-3/README.md @@ -7,7 +7,6 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring ### Relevant Articles: - [Uploading MultipartFile with Spring RestTemplate](https://www.baeldung.com/spring-rest-template-multipart-upload) -- [Get and Post Lists of Objects with RestTemplate](https://www.baeldung.com/spring-rest-template-list) - [Download a Large File Through a Spring RestTemplate](https://www.baeldung.com/spring-resttemplate-download-large-file) - [Access HTTPS REST Service Using Spring RestTemplate](https://www.baeldung.com/spring-resttemplate-secure-https-service) - [Encoding of URI Variables on RestTemplate](https://www.baeldung.com/spring-resttemplate-uri-variables-encode)