Upgrade to 2.0.5 and Polish

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.demo</groupId>
-	<artifactId>tdd</artifactId>
+	<artifactId>springboot-tdd</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.5.11.RELEASE</version>
+		<version>2.0.5.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 

src/main/java/com/demo/tdd/controller/CarController.java

@@ -3,10 +3,14 @@
 import com.demo.tdd.domain.Car;
 import com.demo.tdd.exception.CarNotFoundException;
 import com.demo.tdd.service.CarService;
+
+import lombok.extern.slf4j.Slf4j;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 
+@Slf4j
 @RestController
 public class CarController {
 
@@ -25,6 +29,7 @@ private Car getCart(@PathVariable("name") String carName){
     @ExceptionHandler
     @ResponseStatus(HttpStatus.NOT_FOUND)
     private void carNotFoundHandler(CarNotFoundException ex){
+    	log.error("Entering and leaving CarController : carNotFoundHandler");
     }
 
 

src/main/java/com/demo/tdd/domain/Car.java

@@ -1,30 +1,26 @@
 package com.demo.tdd.domain;
 
-import lombok.Data;
-import lombok.Generated;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
-
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 
+import lombok.Data;
+
 @Data
 @Entity
-@NoArgsConstructor
-@ToString
 public class Car {
 
-    @Id
+	@Id
     @GeneratedValue
     private Long id;
 
     private String name;
 
     private String type;
-
+    
     public Car(String name, String type) {
-        this.name = name;
-        this.type = type;
-    }
+		this.name = name;
+		this.type = type;
+	}
+
 }

src/main/java/com/demo/tdd/exception/CarNotFoundException.java

@@ -2,4 +2,6 @@
 
 public class CarNotFoundException extends RuntimeException {
 
+	private static final long serialVersionUID = 1L;
+
 }

src/main/java/com/demo/tdd/repository/CarRepository.java

@@ -1,9 +1,9 @@
 package com.demo.tdd.repository;
 
-import com.demo.tdd.domain.Car;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
-import org.springframework.web.bind.annotation.RestController;
+
+import com.demo.tdd.domain.Car;
 
 @Repository
 public interface CarRepository extends JpaRepository<Car,Long> {

src/main/java/com/demo/tdd/service/CarService.java

@@ -1,14 +1,13 @@
 package com.demo.tdd.service;
 
-import com.demo.tdd.exception.CarNotFoundException;
-import com.demo.tdd.domain.Car;
-import com.demo.tdd.repository.CarRepository;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
-@Slf4j
+import com.demo.tdd.domain.Car;
+import com.demo.tdd.exception.CarNotFoundException;
+import com.demo.tdd.repository.CarRepository;
+
 @Service
 public class CarService {
 

src/main/resources/import.sql

@@ -1 +1 @@
-INSERT INTO car (id,name,type) VALUES (1,'prius','hybrid');
+INSERT INTO car (id,name,type) VALUES (100,'prius','hybrid');

src/test/java/com/demo/tdd/CachingTest.java

@@ -1,9 +1,10 @@
 package com.demo.tdd;
 
-import com.demo.tdd.config.CachingConfig;
-import com.demo.tdd.domain.Car;
-import com.demo.tdd.repository.CarRepository;
-import com.demo.tdd.service.CarService;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,10 +14,9 @@
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import static org.mockito.BDDMockito.given;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
+import com.demo.tdd.domain.Car;
+import com.demo.tdd.repository.CarRepository;
+import com.demo.tdd.service.CarService;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE)

src/test/java/com/demo/tdd/controller/CarControllerTest.java

@@ -1,8 +1,10 @@
 package com.demo.tdd.controller;
 
-import com.demo.tdd.domain.Car;
-import com.demo.tdd.exception.CarNotFoundException;
-import com.demo.tdd.service.CarService;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.BDDMockito.given;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,10 +14,9 @@
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 
-import static org.mockito.BDDMockito.given;
-import static org.mockito.Matchers.anyString;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import com.demo.tdd.domain.Car;
+import com.demo.tdd.exception.CarNotFoundException;
+import com.demo.tdd.service.CarService;
 
 @RunWith(SpringRunner.class)
 @WebMvcTest(CarController.class)

src/test/java/com/demo/tdd/repository/CarRepositoryTest.java

@@ -1,15 +1,15 @@
 package com.demo.tdd.repository;
 
-import com.demo.tdd.domain.Car;
-import org.assertj.core.api.Assertions;
+import static org.assertj.core.api.Assertions.assertThat;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
 import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import static org.junit.Assert.*;
+import com.demo.tdd.domain.Car;
 
 
 @RunWith(SpringRunner.class)
@@ -28,10 +28,11 @@ public void findByName() {
         // This will get the test entity manager to insert the object to the database
         // and get recreate it.
         // if were to use jpa save method, then you are just testing on the cache but not the actual persistence
-//        Car savedCar = entityManager.persistFlushFind(new Car("prius","hybrid"));
+        Car savedCar = entityManager.persistFlushFind(new Car("prius2","hybrid"));
+        assertThat(savedCar.getId()).isNotNull().isNotNegative();
         Car car = repository.findByName("prius");
 
-        Assertions.assertThat(car.getName()).isEqualTo("prius");
+        assertThat(car.getName()).isEqualTo("prius");
 
     }
 }

src/test/java/com/demo/tdd/service/CarServiceTest.java

@@ -1,16 +1,17 @@
 package com.demo.tdd.service;
 
-import com.demo.tdd.exception.CarNotFoundException;
-import com.demo.tdd.domain.Car;
-import com.demo.tdd.repository.CarRepository;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.BDDMockito.given;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.BDDMockito.given;
+import com.demo.tdd.domain.Car;
+import com.demo.tdd.exception.CarNotFoundException;
+import com.demo.tdd.repository.CarRepository;
 
 @RunWith(MockitoJUnitRunner.class)
 public class CarServiceTest {