JAVA-960: Fix conflicts

spring-resttemplate/src/main/java/com/baeldung/resttemplate/configuration/SpringConfig.java

@@ -26,8 +26,4 @@ public class SpringConfig {
         return new RestTemplateBuilder(customRestTemplateCustomizer());
     }
 
-    @Bean
-    public RestTemplate restTemplate() {
-        return new RestTemplate();
-    }
 }

spring-resttemplate/src/main/java/com/baeldung/resttemplate/lists/service/EmployeeService.java

@@ -7,7 +7,7 @@ import com.baeldung.resttemplate.lists.dto.Employee;
 import java.util.ArrayList;
 import java.util.List;
 
-@Service
+@Service("EmployeeListService")
 public class EmployeeService
 {
     public List<Employee> getAllEmployees()

spring-resttemplate/src/main/java/com/baeldung/sampleapp/web/controller/MyFooController.java

@@ -20,7 +20,7 @@ import com.baeldung.sampleapp.web.dto.Foo;
 import com.baeldung.sampleapp.web.exception.ResourceNotFoundException;
 
 @Controller
-@RequestMapping(value = "/foos")
+@RequestMapping(value = "/foo")
 public class MyFooController {
 
     private final Map<Long, Foo> myfoos;

spring-resttemplate/src/test/java/com/baeldung/SpringTestConfig.java

@@ -11,9 +11,4 @@ import org.springframework.web.client.RestTemplate;
 @ComponentScan("com.baeldung")
 public class SpringTestConfig {
 
-    @Bean
-    public RestTemplate restTemplate() {
-        return new RestTemplate();
-    }
-
 }

spring-resttemplate/src/test/java/com/baeldung/web/service/EmployeeServiceMockRestServiceServerUnitTest.java

@@ -16,6 +16,7 @@ import org.junit.runner.RunWith;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -28,7 +29,7 @@ import org.springframework.web.client.RestTemplate;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 @RunWith(SpringRunner.class)
-@ContextConfiguration(classes = SpringTestConfig.class)
+@SpringBootTest(classes = SpringTestConfig.class)
 public class EmployeeServiceMockRestServiceServerUnitTest {
 
     private static final Logger logger = LoggerFactory.getLogger(EmployeeServiceMockRestServiceServerUnitTest.class);