From 7d78e63edfdd759800d1b9e25605db0cd87c0b1a Mon Sep 17 00:00:00 2001
From: osser-sam <46674082+osser-sam@users.noreply.github.com>
Date: Wed, 3 Feb 2021 01:12:29 +0530
Subject: [PATCH] JAVA-4277: Fix tests in spring-resttemplate module (#10447)

* JAVA-4277: Fix tests in spring-resttemplate module

* JAVA-4277: Moved article from spring-resttemplate to
spring-resttemplate-2
---
 .../spring-resttemplate-2/README.md           |  1 +
 .../spring-resttemplate-2/pom.xml             |  2 +-
 .../redirect/RedirectController.java          |  0
 .../src/main/webapp/WEB-INF/api-servlet.xml   | 36 +++++++++++++++++++
 .../src/main/webapp/WEB-INF/spring-views.xml  | 10 ++++++
 .../RedirectControllerIntegrationTest.java    |  0
 .../spring-resttemplate/pom.xml               |  4 +--
 .../web/service => mock}/EmployeeService.java |  2 +-
 .../client/TestRestTemplateBasicLiveTest.java |  1 +
 ...eServiceMockRestServiceServerUnitTest.java |  5 +--
 .../EmployeeServiceUnitTest.java              |  5 +--
 .../RestTemplateBasicLiveTest.java            |  1 +
 12 files changed, 59 insertions(+), 8 deletions(-)
 rename spring-web-modules/{spring-resttemplate => spring-resttemplate-2}/src/main/java/com/baeldung/sampleapp/web/controller/redirect/RedirectController.java (100%)
 create mode 100644 spring-web-modules/spring-resttemplate-2/src/main/webapp/WEB-INF/api-servlet.xml
 create mode 100644 spring-web-modules/spring-resttemplate-2/src/main/webapp/WEB-INF/spring-views.xml
 rename spring-web-modules/{spring-resttemplate => spring-resttemplate-2}/src/test/java/com/baeldung/web/controller/redirect/RedirectControllerIntegrationTest.java (100%)
 rename spring-web-modules/spring-resttemplate/src/main/java/com/baeldung/{resttemplate/web/service => mock}/EmployeeService.java (95%)
 rename spring-web-modules/spring-resttemplate/src/test/java/com/baeldung/{web/service => mock}/EmployeeServiceMockRestServiceServerUnitTest.java (96%)
 rename spring-web-modules/spring-resttemplate/src/test/java/com/baeldung/{web/service => mock}/EmployeeServiceUnitTest.java (92%)

diff --git a/spring-web-modules/spring-resttemplate-2/README.md b/spring-web-modules/spring-resttemplate-2/README.md
index a903757bb4..b2000e0481 100644
--- a/spring-web-modules/spring-resttemplate-2/README.md
+++ b/spring-web-modules/spring-resttemplate-2/README.md
@@ -10,3 +10,4 @@ This module contains articles about Spring RestTemplate
 - [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)
+- [A Guide To Spring Redirects](https://www.baeldung.com/spring-redirect-and-forward)
diff --git a/spring-web-modules/spring-resttemplate-2/pom.xml b/spring-web-modules/spring-resttemplate-2/pom.xml
index 04be058638..158380b403 100644
--- a/spring-web-modules/spring-resttemplate-2/pom.xml
+++ b/spring-web-modules/spring-resttemplate-2/pom.xml
@@ -11,7 +11,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-boot-2</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>parent-boot-2/pom.xml</relativePath>
+        <relativePath>../../parent-boot-2/pom.xml</relativePath>
     </parent>
 
     <dependencies>
diff --git a/spring-web-modules/spring-resttemplate/src/main/java/com/baeldung/sampleapp/web/controller/redirect/RedirectController.java b/spring-web-modules/spring-resttemplate-2/src/main/java/com/baeldung/sampleapp/web/controller/redirect/RedirectController.java
similarity index 100%
rename from spring-web-modules/spring-resttemplate/src/main/java/com/baeldung/sampleapp/web/controller/redirect/RedirectController.java
rename to spring-web-modules/spring-resttemplate-2/src/main/java/com/baeldung/sampleapp/web/controller/redirect/RedirectController.java
diff --git a/spring-web-modules/spring-resttemplate-2/src/main/webapp/WEB-INF/api-servlet.xml b/spring-web-modules/spring-resttemplate-2/src/main/webapp/WEB-INF/api-servlet.xml
new file mode 100644
index 0000000000..ed37a962e9
--- /dev/null
+++ b/spring-web-modules/spring-resttemplate-2/src/main/webapp/WEB-INF/api-servlet.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:mvc="http://www.springframework.org/schema/mvc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:context="http://www.springframework.org/schema/context"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd 
+    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd 
+    http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.0.xsd"
+>
+
+    <context:component-scan base-package="com.baeldung.sampleapp.web" />
+
+    <mvc:annotation-driven content-negotiation-manager="contentNegotiationManager" >
+        <mvc:message-converters register-defaults="true">
+           <bean class="org.springframework.http.converter.json.MappingJackson2HttpMessageConverter"/>
+<!-- <bean class="org.springframework.http.converter.protobuf.ProtobufHttpMessageConverter"/>         -->      
+  </mvc:message-converters>
+    </mvc:annotation-driven>
+    
+
+    <bean class="org.springframework.web.servlet.view.InternalResourceViewResolver" />
+    <bean class="org.springframework.web.servlet.view.XmlViewResolver">
+        <property name="location">
+            <value>/WEB-INF/spring-views.xml</value>
+        </property>
+        <property name="order" value="0" />
+    </bean>
+
+    
+    <bean id="contentNegotiationManager"
+             class="org.springframework.web.accept.ContentNegotiationManagerFactoryBean">
+       <property name="defaultContentType" value="application/json" />
+  </bean>
+
+
+</beans>
+
+
diff --git a/spring-web-modules/spring-resttemplate-2/src/main/webapp/WEB-INF/spring-views.xml b/spring-web-modules/spring-resttemplate-2/src/main/webapp/WEB-INF/spring-views.xml
new file mode 100644
index 0000000000..2944828d6d
--- /dev/null
+++ b/spring-web-modules/spring-resttemplate-2/src/main/webapp/WEB-INF/spring-views.xml
@@ -0,0 +1,10 @@
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans 
+	http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"
+>
+
+    <bean id="RedirectedUrl" class="org.springframework.web.servlet.view.RedirectView">
+        <property name="url" value="redirectedUrl" />
+    </bean>
+
+</beans>
\ No newline at end of file
diff --git a/spring-web-modules/spring-resttemplate/src/test/java/com/baeldung/web/controller/redirect/RedirectControllerIntegrationTest.java b/spring-web-modules/spring-resttemplate-2/src/test/java/com/baeldung/web/controller/redirect/RedirectControllerIntegrationTest.java
similarity index 100%
rename from spring-web-modules/spring-resttemplate/src/test/java/com/baeldung/web/controller/redirect/RedirectControllerIntegrationTest.java
rename to spring-web-modules/spring-resttemplate-2/src/test/java/com/baeldung/web/controller/redirect/RedirectControllerIntegrationTest.java
diff --git a/spring-web-modules/spring-resttemplate/pom.xml b/spring-web-modules/spring-resttemplate/pom.xml
index c0f266fd62..1db6b5db57 100644
--- a/spring-web-modules/spring-resttemplate/pom.xml
+++ b/spring-web-modules/spring-resttemplate/pom.xml
@@ -188,7 +188,7 @@
                 <artifactId>cargo-maven2-plugin</artifactId>
                 <version>${cargo-maven2-plugin.version}</version>
                 <configuration>
-                    <!--<wait>true</wait> caused errors on commit -->
+                    <wait>true</wait>
                     <container>
                         <containerId>tomcat8x</containerId>
                         <type>embedded</type>
@@ -297,7 +297,7 @@
         <guava.version>20.0</guava.version>
 
         <!-- Maven plugins -->
-        <cargo-maven2-plugin.version>1.6.0</cargo-maven2-plugin.version>
+        <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
         <findbugs-maven-plugin.version>3.0.4</findbugs-maven-plugin.version>
 
         <!-- okhttp -->
diff --git a/spring-web-modules/spring-resttemplate/src/main/java/com/baeldung/resttemplate/web/service/EmployeeService.java b/spring-web-modules/spring-resttemplate/src/main/java/com/baeldung/mock/EmployeeService.java
similarity index 95%
rename from spring-web-modules/spring-resttemplate/src/main/java/com/baeldung/resttemplate/web/service/EmployeeService.java
rename to spring-web-modules/spring-resttemplate/src/main/java/com/baeldung/mock/EmployeeService.java
index 18dff3db1b..16180a3640 100644
--- a/spring-web-modules/spring-resttemplate/src/main/java/com/baeldung/resttemplate/web/service/EmployeeService.java
+++ b/spring-web-modules/spring-resttemplate/src/main/java/com/baeldung/mock/EmployeeService.java
@@ -1,4 +1,4 @@
-package com.baeldung.resttemplate.web.service;
+package com.baeldung.mock;
 
 import com.baeldung.resttemplate.web.model.Employee;
 import org.slf4j.Logger;
diff --git a/spring-web-modules/spring-resttemplate/src/test/java/com/baeldung/client/TestRestTemplateBasicLiveTest.java b/spring-web-modules/spring-resttemplate/src/test/java/com/baeldung/client/TestRestTemplateBasicLiveTest.java
index 9f4b3c9b35..406dd5979b 100644
--- a/spring-web-modules/spring-resttemplate/src/test/java/com/baeldung/client/TestRestTemplateBasicLiveTest.java
+++ b/spring-web-modules/spring-resttemplate/src/test/java/com/baeldung/client/TestRestTemplateBasicLiveTest.java
@@ -18,6 +18,7 @@ import org.springframework.web.client.RestTemplate;
 import okhttp3.Request;
 import okhttp3.RequestBody;
 
+// This test needs RestTemplateConfigurationApplication to be up and running
 public class TestRestTemplateBasicLiveTest {
 
     private RestTemplate restTemplate;
diff --git a/spring-web-modules/spring-resttemplate/src/test/java/com/baeldung/web/service/EmployeeServiceMockRestServiceServerUnitTest.java b/spring-web-modules/spring-resttemplate/src/test/java/com/baeldung/mock/EmployeeServiceMockRestServiceServerUnitTest.java
similarity index 96%
rename from spring-web-modules/spring-resttemplate/src/test/java/com/baeldung/web/service/EmployeeServiceMockRestServiceServerUnitTest.java
rename to spring-web-modules/spring-resttemplate/src/test/java/com/baeldung/mock/EmployeeServiceMockRestServiceServerUnitTest.java
index ee01cb6a50..309e0635a4 100644
--- a/spring-web-modules/spring-resttemplate/src/test/java/com/baeldung/web/service/EmployeeServiceMockRestServiceServerUnitTest.java
+++ b/spring-web-modules/spring-resttemplate/src/test/java/com/baeldung/mock/EmployeeServiceMockRestServiceServerUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.web.service;
+package com.baeldung.mock;
 
 import static org.springframework.test.web.client.match.MockRestRequestMatchers.method;
 import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo;
@@ -7,8 +7,9 @@ import static org.springframework.test.web.client.response.MockRestResponseCreat
 import java.net.URI;
 
 import com.baeldung.SpringTestConfig;
+import com.baeldung.mock.EmployeeService;
 import com.baeldung.resttemplate.web.model.Employee;
-import com.baeldung.resttemplate.web.service.EmployeeService;
+
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/spring-web-modules/spring-resttemplate/src/test/java/com/baeldung/web/service/EmployeeServiceUnitTest.java b/spring-web-modules/spring-resttemplate/src/test/java/com/baeldung/mock/EmployeeServiceUnitTest.java
similarity index 92%
rename from spring-web-modules/spring-resttemplate/src/test/java/com/baeldung/web/service/EmployeeServiceUnitTest.java
rename to spring-web-modules/spring-resttemplate/src/test/java/com/baeldung/mock/EmployeeServiceUnitTest.java
index 6eb040414b..9a992f390a 100644
--- a/spring-web-modules/spring-resttemplate/src/test/java/com/baeldung/web/service/EmployeeServiceUnitTest.java
+++ b/spring-web-modules/spring-resttemplate/src/test/java/com/baeldung/mock/EmployeeServiceUnitTest.java
@@ -1,7 +1,8 @@
-package com.baeldung.web.service;
+package com.baeldung.mock;
 
+import com.baeldung.mock.EmployeeService;
 import com.baeldung.resttemplate.web.model.Employee;
-import com.baeldung.resttemplate.web.service.EmployeeService;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/spring-web-modules/spring-resttemplate/src/test/java/com/baeldung/resttemplate/RestTemplateBasicLiveTest.java b/spring-web-modules/spring-resttemplate/src/test/java/com/baeldung/resttemplate/RestTemplateBasicLiveTest.java
index 0dab124316..8d52394dd1 100644
--- a/spring-web-modules/spring-resttemplate/src/test/java/com/baeldung/resttemplate/RestTemplateBasicLiveTest.java
+++ b/spring-web-modules/spring-resttemplate/src/test/java/com/baeldung/resttemplate/RestTemplateBasicLiveTest.java
@@ -38,6 +38,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
 import com.google.common.base.Charsets;
 
+// This test needs RestTemplateConfigurationApplication to be up and running
 public class RestTemplateBasicLiveTest {
 
     private RestTemplate restTemplate;