diff --git a/spring-resttemplate/pom.xml b/spring-resttemplate/pom.xml
index 9a0978f12048..06d4eed9fc85 100644
--- a/spring-resttemplate/pom.xml
+++ b/spring-resttemplate/pom.xml
@@ -25,6 +25,10 @@
org.springframework.boot
spring-boot-devtools
+
+ org.springframework.boot
+ spring-boot-starter-web
+
org.springframework.boot
spring-boot-starter-test
diff --git a/spring-resttemplate/src/main/java/org/baeldung/resttemplate/configuration/RestTemplateConfigurationApplication.java b/spring-resttemplate/src/main/java/org/baeldung/resttemplate/RestTemplateConfigurationApplication.java
similarity index 89%
rename from spring-resttemplate/src/main/java/org/baeldung/resttemplate/configuration/RestTemplateConfigurationApplication.java
rename to spring-resttemplate/src/main/java/org/baeldung/resttemplate/RestTemplateConfigurationApplication.java
index 76fc346aca23..9a361e92c934 100644
--- a/spring-resttemplate/src/main/java/org/baeldung/resttemplate/configuration/RestTemplateConfigurationApplication.java
+++ b/spring-resttemplate/src/main/java/org/baeldung/resttemplate/RestTemplateConfigurationApplication.java
@@ -1,4 +1,4 @@
-package org.baeldung.resttemplate.configuration;
+package org.baeldung.resttemplate;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
diff --git a/spring-resttemplate/src/main/java/org/baeldung/resttemplate/configuration/SpringConfig.java b/spring-resttemplate/src/main/java/org/baeldung/resttemplate/configuration/SpringConfig.java
index 4e121185b1fe..966d5bcaa1a9 100644
--- a/spring-resttemplate/src/main/java/org/baeldung/resttemplate/configuration/SpringConfig.java
+++ b/spring-resttemplate/src/main/java/org/baeldung/resttemplate/configuration/SpringConfig.java
@@ -7,6 +7,7 @@
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.DependsOn;
+import org.springframework.web.client.RestTemplate;
@Configuration
@EnableAutoConfiguration
@@ -25,4 +26,8 @@ public RestTemplateBuilder restTemplateBuilder() {
return new RestTemplateBuilder(customRestTemplateCustomizer());
}
+ @Bean
+ public RestTemplate restTemplate() {
+ return new RestTemplate();
+ }
}
diff --git a/spring-resttemplate/src/main/java/org/baeldung/web/dto/Foo.java b/spring-resttemplate/src/main/java/org/baeldung/resttemplate/web/dto/Foo.java
similarity index 93%
rename from spring-resttemplate/src/main/java/org/baeldung/web/dto/Foo.java
rename to spring-resttemplate/src/main/java/org/baeldung/resttemplate/web/dto/Foo.java
index 240b368b50e2..ed0a42c4293c 100644
--- a/spring-resttemplate/src/main/java/org/baeldung/web/dto/Foo.java
+++ b/spring-resttemplate/src/main/java/org/baeldung/resttemplate/web/dto/Foo.java
@@ -1,4 +1,4 @@
-package org.baeldung.web.dto;
+package org.baeldung.resttemplate.web.dto;
import com.thoughtworks.xstream.annotations.XStreamAlias;
diff --git a/spring-resttemplate/src/main/java/org/baeldung/web/exception/NotFoundException.java b/spring-resttemplate/src/main/java/org/baeldung/resttemplate/web/exception/NotFoundException.java
similarity index 55%
rename from spring-resttemplate/src/main/java/org/baeldung/web/exception/NotFoundException.java
rename to spring-resttemplate/src/main/java/org/baeldung/resttemplate/web/exception/NotFoundException.java
index 5b4d80a65982..3e606e931462 100644
--- a/spring-resttemplate/src/main/java/org/baeldung/web/exception/NotFoundException.java
+++ b/spring-resttemplate/src/main/java/org/baeldung/resttemplate/web/exception/NotFoundException.java
@@ -1,4 +1,4 @@
-package org.baeldung.web.exception;
+package org.baeldung.resttemplate.web.exception;
public class NotFoundException extends RuntimeException {
}
diff --git a/spring-resttemplate/src/main/java/org/baeldung/web/handler/RestTemplateResponseErrorHandler.java b/spring-resttemplate/src/main/java/org/baeldung/resttemplate/web/handler/RestTemplateResponseErrorHandler.java
similarity index 91%
rename from spring-resttemplate/src/main/java/org/baeldung/web/handler/RestTemplateResponseErrorHandler.java
rename to spring-resttemplate/src/main/java/org/baeldung/resttemplate/web/handler/RestTemplateResponseErrorHandler.java
index b1b87e89a589..d65e8370672d 100644
--- a/spring-resttemplate/src/main/java/org/baeldung/web/handler/RestTemplateResponseErrorHandler.java
+++ b/spring-resttemplate/src/main/java/org/baeldung/resttemplate/web/handler/RestTemplateResponseErrorHandler.java
@@ -1,6 +1,6 @@
-package org.baeldung.web.handler;
+package org.baeldung.resttemplate.web.handler;
-import org.baeldung.web.exception.NotFoundException;
+import org.baeldung.resttemplate.web.exception.NotFoundException;
import org.springframework.http.HttpStatus;
import org.springframework.http.client.ClientHttpResponse;
import org.springframework.stereotype.Component;
diff --git a/spring-resttemplate/src/main/java/org/baeldung/web/model/Bar.java b/spring-resttemplate/src/main/java/org/baeldung/resttemplate/web/model/Bar.java
similarity index 87%
rename from spring-resttemplate/src/main/java/org/baeldung/web/model/Bar.java
rename to spring-resttemplate/src/main/java/org/baeldung/resttemplate/web/model/Bar.java
index 474e2070a5e7..cf5279697f24 100644
--- a/spring-resttemplate/src/main/java/org/baeldung/web/model/Bar.java
+++ b/spring-resttemplate/src/main/java/org/baeldung/resttemplate/web/model/Bar.java
@@ -1,4 +1,4 @@
-package org.baeldung.web.model;
+package org.baeldung.resttemplate.web.model;
public class Bar {
private String id;
diff --git a/spring-resttemplate/src/main/java/org/baeldung/web/model/Employee.java b/spring-resttemplate/src/main/java/org/baeldung/resttemplate/web/model/Employee.java
similarity index 95%
rename from spring-resttemplate/src/main/java/org/baeldung/web/model/Employee.java
rename to spring-resttemplate/src/main/java/org/baeldung/resttemplate/web/model/Employee.java
index 7cab4a043001..a9b84a77b429 100644
--- a/spring-resttemplate/src/main/java/org/baeldung/web/model/Employee.java
+++ b/spring-resttemplate/src/main/java/org/baeldung/resttemplate/web/model/Employee.java
@@ -1,4 +1,4 @@
-package org.baeldung.web.model;
+package org.baeldung.resttemplate.web.model;
import java.util.Date;
import java.util.Objects;
diff --git a/spring-resttemplate/src/main/java/org/baeldung/web/service/BarConsumerService.java b/spring-resttemplate/src/main/java/org/baeldung/resttemplate/web/service/BarConsumerService.java
similarity index 78%
rename from spring-resttemplate/src/main/java/org/baeldung/web/service/BarConsumerService.java
rename to spring-resttemplate/src/main/java/org/baeldung/resttemplate/web/service/BarConsumerService.java
index 0bf24bd48015..54a66ea59142 100644
--- a/spring-resttemplate/src/main/java/org/baeldung/web/service/BarConsumerService.java
+++ b/spring-resttemplate/src/main/java/org/baeldung/resttemplate/web/service/BarConsumerService.java
@@ -1,7 +1,7 @@
-package org.baeldung.web.service;
+package org.baeldung.resttemplate.web.service;
-import org.baeldung.web.handler.RestTemplateResponseErrorHandler;
-import org.baeldung.web.model.Bar;
+import org.baeldung.resttemplate.web.handler.RestTemplateResponseErrorHandler;
+import org.baeldung.resttemplate.web.model.Bar;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.web.client.RestTemplateBuilder;
import org.springframework.stereotype.Service;
diff --git a/spring-resttemplate/src/main/java/org/baeldung/web/service/EmployeeService.java b/spring-resttemplate/src/main/java/org/baeldung/resttemplate/web/service/EmployeeService.java
similarity index 89%
rename from spring-resttemplate/src/main/java/org/baeldung/web/service/EmployeeService.java
rename to spring-resttemplate/src/main/java/org/baeldung/resttemplate/web/service/EmployeeService.java
index 91614e90ad7c..c6562fbc9412 100644
--- a/spring-resttemplate/src/main/java/org/baeldung/web/service/EmployeeService.java
+++ b/spring-resttemplate/src/main/java/org/baeldung/resttemplate/web/service/EmployeeService.java
@@ -1,6 +1,6 @@
-package org.baeldung.web.service;
+package org.baeldung.resttemplate.web.service;
-import org.baeldung.web.model.Employee;
+import org.baeldung.resttemplate.web.model.Employee;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-resttemplate/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-resttemplate/src/test/java/org/baeldung/SpringContextIntegrationTest.java
index 3a5a20cfeb4e..3c762b894b33 100644
--- a/spring-resttemplate/src/test/java/org/baeldung/SpringContextIntegrationTest.java
+++ b/spring-resttemplate/src/test/java/org/baeldung/SpringContextIntegrationTest.java
@@ -1,6 +1,6 @@
package org.baeldung;
-import org.baeldung.resttemplate.configuration.RestTemplateConfigurationApplication;
+import org.baeldung.resttemplate.RestTemplateConfigurationApplication;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.test.context.SpringBootTest;
diff --git a/spring-resttemplate/src/test/java/org/baeldung/client/RestTemplateBasicLiveTest.java b/spring-resttemplate/src/test/java/org/baeldung/client/RestTemplateBasicLiveTest.java
index 143aa079d524..c837e23547f4 100644
--- a/spring-resttemplate/src/test/java/org/baeldung/client/RestTemplateBasicLiveTest.java
+++ b/spring-resttemplate/src/test/java/org/baeldung/client/RestTemplateBasicLiveTest.java
@@ -14,7 +14,7 @@
import java.util.Arrays;
import java.util.Set;
-import org.baeldung.web.dto.Foo;
+import org.baeldung.resttemplate.web.dto.Foo;
import org.junit.Before;
import org.junit.Test;
import org.springframework.http.HttpEntity;
diff --git a/spring-resttemplate/src/test/java/org/baeldung/web/handler/RestTemplateResponseErrorHandlerIntegrationTest.java b/spring-resttemplate/src/test/java/org/baeldung/web/handler/RestTemplateResponseErrorHandlerIntegrationTest.java
index 2dfa81f44115..60069cea71e8 100644
--- a/spring-resttemplate/src/test/java/org/baeldung/web/handler/RestTemplateResponseErrorHandlerIntegrationTest.java
+++ b/spring-resttemplate/src/test/java/org/baeldung/web/handler/RestTemplateResponseErrorHandlerIntegrationTest.java
@@ -1,7 +1,8 @@
package org.baeldung.web.handler;
-import org.baeldung.web.exception.NotFoundException;
-import org.baeldung.web.model.Bar;
+import org.baeldung.resttemplate.web.exception.NotFoundException;
+import org.baeldung.resttemplate.web.handler.RestTemplateResponseErrorHandler;
+import org.baeldung.resttemplate.web.model.Bar;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/spring-resttemplate/src/test/java/org/baeldung/web/service/EmployeeServiceMockRestServiceServerUnitTest.java b/spring-resttemplate/src/test/java/org/baeldung/web/service/EmployeeServiceMockRestServiceServerUnitTest.java
index a45af318f1a3..f93ba716662e 100644
--- a/spring-resttemplate/src/test/java/org/baeldung/web/service/EmployeeServiceMockRestServiceServerUnitTest.java
+++ b/spring-resttemplate/src/test/java/org/baeldung/web/service/EmployeeServiceMockRestServiceServerUnitTest.java
@@ -7,7 +7,8 @@
import java.net.URI;
import org.baeldung.SpringTestConfig;
-import org.baeldung.web.model.Employee;
+import org.baeldung.resttemplate.web.model.Employee;
+import org.baeldung.resttemplate.web.service.EmployeeService;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/spring-resttemplate/src/test/java/org/baeldung/web/service/EmployeeServiceUnitTest.java b/spring-resttemplate/src/test/java/org/baeldung/web/service/EmployeeServiceUnitTest.java
index 23cd9a8fd23e..f4b391573a7f 100644
--- a/spring-resttemplate/src/test/java/org/baeldung/web/service/EmployeeServiceUnitTest.java
+++ b/spring-resttemplate/src/test/java/org/baeldung/web/service/EmployeeServiceUnitTest.java
@@ -1,6 +1,7 @@
package org.baeldung.web.service;
-import org.baeldung.web.model.Employee;
+import org.baeldung.resttemplate.web.model.Employee;
+import org.baeldung.resttemplate.web.service.EmployeeService;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;