Added devtools,integration tests,model validation,

Author: teetangh

.gitignore

@@ -1,11 +1,12 @@
 .gradle
 build/
+out/
 .vscode/
 
 # Default ignored files
 shelf/
-/workspace.xml
 .idea/
+/workspace.xml
 .idea_modules/
 sonarlint/
 

build.gradle

@@ -22,6 +22,7 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	implementation 'org.springframework.data:spring-data-couchbase'
 
+	implementation 'org.springframework.boot:spring-boot-devtools'
 	// lombok
 	compileOnly 'org.projectlombok:lombok'
 	annotationProcessor 'org.projectlombok:lombok'

out/production/resources/application.properties

@@ -0,0 +1,29 @@
+package org.couchbase.quickstart.springdata.advice;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.validation.FieldError;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+@RestControllerAdvice
+public class ApplicationExceptionHandler {
+
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public Map<String, String> handleValidationExceptions(
+            MethodArgumentNotValidException ex) {
+        Map<String, String> errorMap = new HashMap<>();
+
+        ex.getBindingResult().getAllErrors().forEach(error -> {
+            String fieldName = ((FieldError) error).getField();
+            String errorMessage = error.getDefaultMessage();
+            errorMap.put(fieldName, errorMessage);
+        });
+        
+        return errorMap;
+    }
+}

src/main/java/org/couchbase/quickstart/springdata/advice/ApplicationExceptionHandler.java

@@ -2,9 +2,9 @@
 
 import java.util.Optional;
 
-import org.couchbase.quickstart.springdata.model.Airline;
-import org.couchbase.quickstart.springdata.model.Airport;
-import org.couchbase.quickstart.springdata.model.Route;
+import org.couchbase.quickstart.springdata.models.Airline;
+import org.couchbase.quickstart.springdata.models.Airport;
+import org.couchbase.quickstart.springdata.models.Route;
 import org.couchbase.quickstart.springdata.repository.AirlineRepository;
 import org.couchbase.quickstart.springdata.repository.AirportRepository;
 import org.couchbase.quickstart.springdata.repository.RouteRepository;

src/main/java/org/couchbase/quickstart/springdata/config/DBSetupRunner.java

@@ -2,7 +2,9 @@
 
 import java.util.Optional;
 
-import org.couchbase.quickstart.springdata.model.Airline;
+import javax.validation.Valid;
+
+import org.couchbase.quickstart.springdata.models.Airline;
 import org.couchbase.quickstart.springdata.services.AirlineService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -31,7 +33,7 @@ public AirlineController(AirlineService airlineService) {
     }
 
     @PostMapping("/{id}")
-    public ResponseEntity<Airline> createAirline(@PathVariable String id, @RequestBody Airline airline) {
+    public ResponseEntity<Airline> createAirline(@PathVariable String id, @Valid @RequestBody Airline airline) {
         Airline createdAirline = airlineService.createAirline(id, airline);
         return new ResponseEntity<>(createdAirline, HttpStatus.CREATED);
     }
@@ -44,7 +46,7 @@ public ResponseEntity<Airline> getAirline(@PathVariable String id) {
     }
 
     @PutMapping("/{id}")
-    public ResponseEntity<Airline> updateAirline(@PathVariable String id, @RequestBody Airline airline) {
+    public ResponseEntity<Airline> updateAirline(@PathVariable String id, @Valid @RequestBody Airline airline) {
         Airline updatedAirline = airlineService.updateAirline(id, airline);
         return new ResponseEntity<>(updatedAirline, HttpStatus.OK);
     }

src/main/java/org/couchbase/quickstart/springdata/controller/AirlineController.java

@@ -2,7 +2,9 @@
 
 import java.util.Optional;
 
-import org.couchbase.quickstart.springdata.model.Airport;
+import javax.validation.Valid;
+
+import org.couchbase.quickstart.springdata.models.Airport;
 import org.couchbase.quickstart.springdata.services.AirportService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -27,7 +29,7 @@ public class AirportController {
     private AirportService airportService;
 
     @PostMapping("/{id}")
-    public ResponseEntity<Airport> createAirport(@PathVariable String id, @RequestBody Airport airport) {
+    public ResponseEntity<Airport> createAirport(@PathVariable String id, @Valid @RequestBody Airport airport) {
         Airport createdAirport = airportService.createAirport(id, airport);
         return new ResponseEntity<>(createdAirport, HttpStatus.CREATED);
     }
@@ -40,7 +42,7 @@ public ResponseEntity<Airport> getAirport(@PathVariable String id) {
     }
 
     @PutMapping("/{id}")
-    public ResponseEntity<Airport> updateAirport(@PathVariable String id, @RequestBody Airport airport) {
+    public ResponseEntity<Airport> updateAirport(@PathVariable String id, @Valid @RequestBody Airport airport) {
         Airport updatedAirport = airportService.updateAirport(id, airport);
         return new ResponseEntity<>(updatedAirport, HttpStatus.OK);
     }

src/main/java/org/couchbase/quickstart/springdata/controller/AirportController.java

@@ -3,7 +3,9 @@
 import java.util.List;
 import java.util.UUID;
 
-import org.couchbase.quickstart.springdata.model.Profile;
+import javax.validation.Valid;
+
+import org.couchbase.quickstart.springdata.models.Profile;
 import org.couchbase.quickstart.springdata.repository.ProfileRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -66,7 +68,7 @@ public ResponseEntity<Profile> getProfileById(@PathVariable("id") UUID id) {
   }
 
   @PostMapping("/profile")
-  public ResponseEntity<Profile> saveProfile(@RequestBody Profile profile) {
+  public ResponseEntity<Profile> saveProfile(@Valid @RequestBody Profile profile) {
     // the same endpoint can be used to create and save the object
     profile = profileRepository.save(profile);
     return ResponseEntity.status(HttpStatus.CREATED).body(profile);

src/main/java/org/couchbase/quickstart/springdata/controller/ProfileController.java

@@ -2,7 +2,9 @@
 
 import java.util.Optional;
 
-import org.couchbase.quickstart.springdata.model.Route;
+import javax.validation.Valid;
+
+import org.couchbase.quickstart.springdata.models.Route;
 import org.couchbase.quickstart.springdata.services.RouteService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -27,7 +29,7 @@ public class RouteController {
     private RouteService routeService;
 
     @PostMapping("/{id}")
-    public ResponseEntity<Route> createRoute(@PathVariable String id, @RequestBody Route route) {
+    public ResponseEntity<Route> createRoute(@PathVariable String id, @Valid @RequestBody Route route) {
         Route createdRoute = routeService.createRoute(id, route);
         return new ResponseEntity<>(createdRoute, HttpStatus.CREATED);
     }
@@ -40,7 +42,7 @@ public ResponseEntity<Route> getRoute(@PathVariable String id) {
     }
 
     @PutMapping("/{id}")
-    public ResponseEntity<Route> updateRoute(@PathVariable String id, @RequestBody Route route) {
+    public ResponseEntity<Route> updateRoute(@PathVariable String id, @Valid @RequestBody Route route) {
         Route updatedRoute = routeService.updateRoute(id, route);
         return new ResponseEntity<>(updatedRoute, HttpStatus.OK);
     }