Merge branch 'dev' into feature_gardenplan-model_M2

src/main/java/ch/zhaw/gartenverwaltung/io/JsonGardenPlan.java

@@ -20,7 +20,7 @@ import java.util.Map;
 import java.util.Optional;
 
 public class JsonGardenPlan implements GardenPlan {
-    private final URL dataSource = getClass().getResource("user-crops.json");
+    private final URL dataSource;
 
     private IdProvider idProvider;
     private Map<Long, Crop> cropMap = Collections.emptyMap();
@@ -40,7 +40,21 @@ public class JsonGardenPlan implements GardenPlan {
     }
 
     /**
-     * @see GardenPlan#getCrops()
+     * Default constructor
+     */
+    public JsonGardenPlan() {
+        this.dataSource = getClass().getResource("user-crops.json");
+    }
+
+    /**
+     * Constructor to use a specified {@link URL} as a {@link #dataSource}
+     * @param dataSource A {@link URL} to the file to be used as a data source
+     */
+    public JsonGardenPlan(URL dataSource) {
+        this.dataSource = dataSource;
+    }
+    /**
+     * {@inheritDoc}
      */
     @Override
     public List<Crop> getCrops() throws IOException {
@@ -51,7 +65,7 @@ public class JsonGardenPlan implements GardenPlan {
     }
 
     /**
-     * @see GardenPlan#getCropById(long)
+     * {@inheritDoc}
      */
     @Override
     public Optional<Crop> getCropById(long id) throws IOException {
@@ -62,7 +76,7 @@ public class JsonGardenPlan implements GardenPlan {
     }
 
     /**
-     * @see GardenPlan#saveCrop(Crop)
+     * {@inheritDoc}
      *
      * Saves a crop to the database.
      * If no {@link Crop#cropId} is set, one will be generated and
@@ -79,7 +93,7 @@ public class JsonGardenPlan implements GardenPlan {
     }
 
     /**
-     * @see GardenPlan#removeCrop(Crop)
+     * {@inheritDoc}
      */
     @Override
     public void removeCrop(Crop crop) throws IOException {

src/main/java/ch/zhaw/gartenverwaltung/io/JsonPlantDatabase.java

@@ -89,15 +89,16 @@ public class JsonPlantDatabase implements PlantDatabase {
             List<Plant> result;
             result = mapper.readerForListOf(Plant.class).readValue(dataSource);
 
-            for (Plant plant : result) {
-                plant.inZone(currentZone);
-            }
-
-            // Turn list into a HashMap with structure id => Plant
             plantMap = result.stream()
+                    // Remove plants not in the current zone
+                    .filter(plant -> {
+                        plant.inZone(currentZone);
+                        return !plant.lifecycle().isEmpty();
+                    })
+                    // Create Hashmap from results
                     .collect(HashMap::new,
                             (res, plant) -> res.put(plant.id(), plant),
-                            (existing, replacement) -> { });
+                            (existing, replacement) -> {});
         }
     }
 }