Changes Java 8 e mudanças no insert do mongo, para salvar na collecti…

…on especifica da model
emiteze · Dec 7, 2017 · cea59ee · cea59ee
1 parent f8c6925
commit cea59ee
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 37 deletions.
diff --git a/src/main/java/zup/mateus/cruz/xyinc/controller/PointOfInterestController.java b/src/main/java/zup/mateus/cruz/xyinc/controller/PointOfInterestController.java
@@ -48,7 +48,7 @@ public ResponseEntity<?> getPointsNearby(@RequestParam("coordx") int coordx, @Re
         }
     }
 
-    @RequestMapping(value = "/save-point", method = RequestMethod.POST)
+    @RequestMapping(value = "/save-point", method = {RequestMethod.POST, RequestMethod.PUT})
     public ResponseEntity<?> savePoint(@RequestBody PointOfInterest poi){
         try {
             poiService.savePoint(poi);
@@ -58,7 +58,7 @@ public ResponseEntity<?> savePoint(@RequestBody PointOfInterest poi){
         }
     }
 
-    @RequestMapping(value = "/delete-point", method = RequestMethod.DELETE)
+    @RequestMapping(value = "/delete-point", method = {RequestMethod.DELETE, RequestMethod.POST})
     public ResponseEntity<?> deletePoint(@RequestParam(value = "id", required = false) UUID id, @RequestParam(value = "name", required = false) String name, @RequestBody(required = false) PointOfInterest poi){
         try {
             if(id != null){
@@ -77,20 +77,4 @@ public ResponseEntity<?> deletePoint(@RequestParam(value = "id", required = fals
         return ResponseEntity.badRequest().build();
     }
 
-    @RequestMapping(value = "/update-point", method = RequestMethod.PUT)
-    public ResponseEntity<?> updatePoint(@RequestBody PointOfInterest poi){
-        try {
-            poiService.updatePoint(poi);
-            return ResponseEntity.ok(poiService.getPoints());
-        } catch(Exception e){
-            return ResponseEntity.badRequest().build();
-        }
-    }
-
-    /*@RequestMapping(value = "/save-point", method = RequestMethod.POST)
-    public List<PointOfInterest> savePoint(@RequestParam("name") String name, @RequestParam("coordx") int coordx, @RequestParam("coordy") int coordy){
-        poiService.savePoint(new PointOfInterest(name, coordx, coordy));
-        return poiService.getPoints();
-    }*/
-
 }
diff --git a/src/main/java/zup/mateus/cruz/xyinc/model/PointOfInterest.java b/src/main/java/zup/mateus/cruz/xyinc/model/PointOfInterest.java
@@ -2,10 +2,13 @@
 
 import org.hibernate.validator.constraints.NotEmpty;
 import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.mapping.Document;
+
 import javax.validation.constraints.Min;
 import java.io.Serializable;
 import java.util.UUID;
 
+@Document(collection = "pointsofinterest")
 public class PointOfInterest implements Serializable{
 
     @Id

diff --git a/src/main/java/zup/mateus/cruz/xyinc/service/PointOfInterestService.java b/src/main/java/zup/mateus/cruz/xyinc/service/PointOfInterestService.java
@@ -4,9 +4,9 @@
 import org.springframework.stereotype.Service;
 import zup.mateus.cruz.xyinc.repository.PointOfInterestRepository;
 import zup.mateus.cruz.xyinc.model.PointOfInterest;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 @Service
 public class PointOfInterestService {
@@ -19,10 +19,7 @@ public List<PointOfInterest> getPoints(){
     }
 
     public List<PointOfInterest> getPointsNearby(PointOfInterest userLocation, double maxDistance){
-        List<PointOfInterest> nearbyPoints = new ArrayList<>();
-        for (PointOfInterest poi : this.getPoints()) {
-            if(userLocation.distanceBetweenPoints(poi) <= maxDistance) nearbyPoints.add(poi);
-        }
+        List<PointOfInterest> nearbyPoints = this.getPoints().stream().filter(point -> userLocation.distanceBetweenPoints(point) <= maxDistance).collect(Collectors.toList());
         return nearbyPoints;
     }
 
@@ -36,9 +33,7 @@ public List<PointOfInterest> findPointsByName(String name){
 
     public void deleteByName(String name){
         List<PointOfInterest> pointsToBeRemoved = findPointsByName(name);
-        for(PointOfInterest poi : pointsToBeRemoved){
-            repository.delete(poi.getId());
-        }
+        repository.delete(pointsToBeRemoved);
     }
 
     public void deleteObject(PointOfInterest poi) { repository.delete(poi); }
@@ -51,6 +46,4 @@ public void savePoint(PointOfInterest poi){
         repository.save(poi);
     }
 
-    public void updatePoint(PointOfInterest poi){ repository.save(poi); }
-
 }
diff --git a/src/test/java/zup/mateus/cruz/xyinc/repository/PointOfInterestRepositoryTest.java b/src/test/java/zup/mateus/cruz/xyinc/repository/PointOfInterestRepositoryTest.java
@@ -35,22 +35,22 @@ public void restoreDB() {
     }
 
     private void saveInRepoEachPointInList(List<PointOfInterest> listOfPoints){
-        for(PointOfInterest poi : listOfPoints){
-            repository.save(poi);
-        }
+        listOfPoints.forEach(point -> {
+            repository.save(point);
+        });
     }
 
     private void deleteInRepoEachPointInList(List<PointOfInterest> listOfPoints){
-        for(PointOfInterest poi : listOfPoints){
-            repository.delete(poi);
-        }
+        listOfPoints.forEach(point -> {
+            repository.delete(point);
+        });
     }
 
     @Test
     public void testFindAllPopulatedDB() throws Exception {
 
         List<PointOfInterest> backup = new ArrayList<>();
-        for(PointOfInterest poi : repository.findAll()) backup.add(poi);
+        backup.addAll(repository.findAll());
         repository.deleteAll();
 
         PointOfInterest pointOne = new PointOfInterest("point1", 10, 10);
@@ -109,7 +109,7 @@ public void testFindByNameReturnsListOfObject() throws Exception {
     public void testDeleteByNonExistingId() throws Exception {
 
         List<PointOfInterest> backup = new ArrayList<>();
-        for(PointOfInterest poi : repository.findAll()) backup.add(poi);
+        backup.addAll(repository.findAll());
         repository.deleteAll();
 
         PointOfInterest pointOne = new PointOfInterest("point1", 10, 10);
@@ -131,7 +131,7 @@ public void testDeleteByNonExistingId() throws Exception {
     public void testDeleteByExistingId() throws Exception {
 
         List<PointOfInterest> backup = new ArrayList<>();
-        for(PointOfInterest poi : repository.findAll()) backup.add(poi);
+        backup.addAll(repository.findAll());
         repository.deleteAll();
 
         PointOfInterest pointOne = new PointOfInterest("point1", 10, 10);