From 553c368b5bec2784ca997a67d1895344e2afa188 Mon Sep 17 00:00:00 2001
From: Yasin <yasin.bhojawala@gmail.com>
Date: Tue, 18 Apr 2017 23:12:29 +0530
Subject: [PATCH] BAEL-88 Testing in Spring Boot (#1679)

Review comments
---
 .../baeldung/boot/boottest/EmployeeRestController.java   | 9 +++++----
 .../org/baeldung/boot/boottest/EmployeeServiceImpl.java  | 2 +-
 .../baeldung/boot/boottest/EmployeeRepositoryTest.java   | 4 ++--
 .../boot/boottest/EmployeeRestControllerIntTest.java     | 4 ++--
 .../boot/boottest/EmployeeRestControllerTest.java        | 4 ++--
 .../baeldung/boot/boottest/EmployeeServiceImplTest.java  | 4 ++--
 6 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/spring-boot/src/main/java/org/baeldung/boot/boottest/EmployeeRestController.java b/spring-boot/src/main/java/org/baeldung/boot/boottest/EmployeeRestController.java
index 8442fc03a3..1bfde0f0bd 100644
--- a/spring-boot/src/main/java/org/baeldung/boot/boottest/EmployeeRestController.java
+++ b/spring-boot/src/main/java/org/baeldung/boot/boottest/EmployeeRestController.java
@@ -5,9 +5,10 @@ import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
@@ -15,16 +16,16 @@ import org.springframework.web.bind.annotation.RestController;
 public class EmployeeRestController {
 
     @Autowired
-    EmployeeService employeeService;
+    private EmployeeService employeeService;
 
-    @RequestMapping(value = "/employees", method = RequestMethod.POST)
+    @PostMapping("/employees")
     public ResponseEntity<Employee> createEmployee(@RequestBody Employee employee) {
         HttpStatus status = HttpStatus.CREATED;
         Employee saved = employeeService.save(employee);
         return new ResponseEntity<>(saved, status);
     }
 
-    @RequestMapping(value = "/employees", method = RequestMethod.GET)
+    @GetMapping("/employees")
     public List<Employee> getAllEmployees() {
         return employeeService.getAllEmployees();
     }
diff --git a/spring-boot/src/main/java/org/baeldung/boot/boottest/EmployeeServiceImpl.java b/spring-boot/src/main/java/org/baeldung/boot/boottest/EmployeeServiceImpl.java
index 21936255e0..6d5bf426ec 100644
--- a/spring-boot/src/main/java/org/baeldung/boot/boottest/EmployeeServiceImpl.java
+++ b/spring-boot/src/main/java/org/baeldung/boot/boottest/EmployeeServiceImpl.java
@@ -13,7 +13,7 @@ import org.springframework.stereotype.Service;
 public class EmployeeServiceImpl implements EmployeeService {
 
     @Autowired
-    EmployeeRepository employeeRepository;
+    private EmployeeRepository employeeRepository;
 
     @Override
     public Optional<Employee> getEmployeeById(Long id) {
diff --git a/spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeRepositoryTest.java b/spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeRepositoryTest.java
index f47e28a7e1..a29928bcca 100644
--- a/spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeRepositoryTest.java
+++ b/spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeRepositoryTest.java
@@ -20,10 +20,10 @@ import org.springframework.test.context.junit4.SpringRunner;
 public class EmployeeRepositoryTest {
 
     @Autowired
-    TestEntityManager entityManager;
+    private TestEntityManager entityManager;
 
     @Autowired
-    EmployeeRepository employeeRepository;
+    private EmployeeRepository employeeRepository;
 
     @Test
     public void whenFindByName_thenReturnEmployee() {
diff --git a/spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeRestControllerIntTest.java b/spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeRestControllerIntTest.java
index 6360970345..6ca8d267f9 100644
--- a/spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeRestControllerIntTest.java
+++ b/spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeRestControllerIntTest.java
@@ -34,10 +34,10 @@ import org.springframework.test.web.servlet.MockMvc;
 public class EmployeeRestControllerIntTest {
 
     @Autowired
-    MockMvc mvc;
+    private MockMvc mvc;
 
     @Autowired
-    EmployeeRepository repository;
+    private EmployeeRepository repository;
 
     @After
     public void resetDb() {
diff --git a/spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeRestControllerTest.java b/spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeRestControllerTest.java
index 0187ba9969..71e69cf419 100644
--- a/spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeRestControllerTest.java
+++ b/spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeRestControllerTest.java
@@ -33,10 +33,10 @@ import org.springframework.test.web.servlet.MockMvc;
 public class EmployeeRestControllerTest {
 
     @Autowired
-    MockMvc mvc;
+    private MockMvc mvc;
 
     @MockBean
-    EmployeeService service;
+    private EmployeeService service;
 
     @Before
     public void setUp() throws Exception {
diff --git a/spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeServiceImplTest.java b/spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeServiceImplTest.java
index 345cc29e02..acb884e851 100644
--- a/spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeServiceImplTest.java
+++ b/spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeServiceImplTest.java
@@ -34,10 +34,10 @@ public class EmployeeServiceImplTest {
     }
 
     @Autowired
-    EmployeeService employeeService;
+    private EmployeeService employeeService;
 
     @MockBean
-    EmployeeRepository employeeRepository;
+    private EmployeeRepository employeeRepository;
 
     @Before
     public void setUp() {