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

@@ -1,13 +1,10 @@
 package ch.zhaw.gartenverwaltung.io;
 
-import ch.zhaw.gartenverwaltung.json.PlantImageDeserializer;
 import ch.zhaw.gartenverwaltung.types.HardinessZone;
 import ch.zhaw.gartenverwaltung.types.Plant;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.fasterxml.jackson.datatype.jsr310.deser.MonthDayDeserializer;
-import javafx.scene.image.Image;
 
 import java.io.IOException;
 import java.net.URL;
@@ -34,14 +31,10 @@ public class JsonPlantDatabase implements PlantDatabase {
      * Creating constant objects required to deserialize the {@link MonthDay} classes
      */
     private final static JavaTimeModule timeModule = new JavaTimeModule();
-    private final static SimpleModule imageModule = new SimpleModule();
-
     static {
         DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("MM-dd");
         MonthDayDeserializer dateDeserializer = new MonthDayDeserializer(dateFormat);
         timeModule.addDeserializer(MonthDay.class, dateDeserializer);
-
-        imageModule.addDeserializer(Image.class, new PlantImageDeserializer());
     }
 
     /**
@@ -82,9 +75,8 @@ public class JsonPlantDatabase implements PlantDatabase {
         }
         if (dataSource != null) {
             currentZone = zone;
-            ObjectMapper mapper = new ObjectMapper()
+            ObjectMapper mapper = new ObjectMapper();
-                    .registerModule(timeModule)
+            mapper.registerModule(timeModule);
-                    .registerModule(imageModule);
 
             List<Plant> result;
             result = mapper.readerForListOf(Plant.class).readValue(dataSource);

src/main/java/ch/zhaw/gartenverwaltung/json/GrowthPhaseTypeDeserializer.java

@@ -17,12 +17,11 @@ public class GrowthPhaseTypeDeserializer extends StdDeserializer<GrowthPhaseType
     @Override
     public GrowthPhaseType deserialize(JsonParser parser, DeserializationContext context) throws IOException {
         GrowthPhaseType result = null;
-        String token = parser.getText();
         try {
-            result = GrowthPhaseType.valueOf(token.toUpperCase());
+            result = GrowthPhaseType.valueOf(parser.getText().toUpperCase());
         } catch (IllegalArgumentException e) {
             // TODO: Log
-            System.err.printf("Bad growth phase type \"%s\"\n", token);
+            System.err.println("bad growth phase type");
         }
         return result;
     }

src/main/java/ch/zhaw/gartenverwaltung/json/HardinessZoneDeserializer.java

@@ -18,12 +18,11 @@ public class HardinessZoneDeserializer extends StdDeserializer<HardinessZone> {
     @Override
     public HardinessZone deserialize(JsonParser parser, DeserializationContext context) throws IOException {
         HardinessZone result = null;
-        String token = parser.getText();
         try {
-            result = HardinessZone.valueOf(token.toUpperCase());
+            result = HardinessZone.valueOf(parser.getText().toUpperCase());
         } catch (IllegalArgumentException e) {
             // TODO: Log
-            System.err.printf("Unknown Hardiness Zone \"%s\"\n", token);
+            System.err.println("bad growth phase type");
         }
         return result;
     }

src/main/java/ch/zhaw/gartenverwaltung/json/PlantImageDeserializer.java

@@ -1,31 +0,0 @@
-package ch.zhaw.gartenverwaltung.json;
-
-import ch.zhaw.gartenverwaltung.io.PlantDatabase;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import javafx.scene.image.Image;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-
-public class PlantImageDeserializer extends JsonDeserializer<Image> {
-
-    @Override
-    public Image deserialize(JsonParser parser, DeserializationContext context) throws IOException {
-        Image result = null;
-        URL imageUrl = PlantDatabase.class.getResource(String.format("images/%s", parser.getText()));
-        if (imageUrl != null) {
-            try (InputStream is = new FileInputStream(imageUrl.getFile())) {
-                result = new Image(is);
-            } catch (IllegalArgumentException e) {
-                // TODO: Log
-                e.printStackTrace();
-                System.err.printf("Cannot find Image \"%s\"\n", imageUrl.getFile());
-            }
-        }
-        return result;
-    }
-}

src/main/java/ch/zhaw/gartenverwaltung/types/Plant.java

@@ -1,7 +1,5 @@
 package ch.zhaw.gartenverwaltung.types;
 
-import javafx.scene.image.Image;
-
 import java.time.LocalDate;
 import java.util.List;
 
@@ -11,7 +9,6 @@ public record Plant(
         long id,
         String name,
         String description,
-        Image image,
         String spacing,
         int light,
         String soil,

src/main/resources/ch/zhaw/gartenverwaltung/io/images/ATTRIBUTION

@@ -1,5 +0,0 @@
-Potato, Onion
-    Photos by Lars Blankers: https://unsplash.com/@lmablankers?utm_source=unsplash&utm_medium=referral&utm_content=creditCopyText
-
-Carrot
-    Photo by Maja Vujic: https://unsplash.com/@majavujic87?utm_source=unsplash&utm_medium=referral&utm_content=creditCopyText

src/main/resources/ch/zhaw/gartenverwaltung/io/plantdb.json

@@ -6,7 +6,6 @@
     "light": 6,
     "spacing": "35",
     "soil": "sandy",
-    "image": "potato.jpg",
     "pests": [
       {
         "name": "Rot",
@@ -87,7 +86,6 @@
     "id": 1,
     "name": "Early Carrot",
     "description": "Carrot, (Daucus carota), herbaceous, generally biennial plant of the Apiaceae family that produces an edible taproot. Among common varieties root shapes range from globular to long, with lower ends blunt to pointed. Besides the orange-coloured roots, white-, yellow-, and purple-fleshed varieties are known.",
-    "image": "carrot.jpg",
     "lifecycle": [
       {
         "startDate": "02-20",
@@ -169,7 +167,6 @@
     "id": 2,
     "name": "Summertime Onion",
     "description": "Onion, (Allium cepa), herbaceous biennial plant in the amaryllis family (Amaryllidaceae) grown for its edible bulb. The onion is likely native to southwestern Asia but is now grown throughout the world, chiefly in the temperate zones. Onions are low in nutrients but are valued for their flavour and are used widely in cooking. They add flavour to such dishes as stews, roasts, soups, and salads and are also served as a cooked vegetable.",
-    "image": "onion.jpg",
     "lifecycle": [
       {
         "startDate": "03-15",

src/test/java/ch/zhaw/gartenverwaltung/io/JsonPlantDatabaseTest.java

@@ -30,7 +30,9 @@ public class JsonPlantDatabaseTest {
         List<Plant> testList;
         try {
             testList = testDatabase.getPlantList(HardinessZone.ZONE_8A);
-        } catch (IOException | HardinessZoneNotSetException e) {
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        } catch (HardinessZoneNotSetException e) {
             throw new RuntimeException(e);
         }
         Assertions.assertEquals(3, testList.size());
@@ -45,8 +47,11 @@ public class JsonPlantDatabaseTest {
     void getPlantById() {
         Optional<Plant> testPlant;
         try {
-            testPlant = testDatabase.getPlantById(HardinessZone.ZONE_8A,1);
+            testDatabase.getPlantList(HardinessZone.ZONE_8A);
-        } catch (IOException | HardinessZoneNotSetException e) {
+            testPlant = testDatabase.getPlantById(1);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        } catch (HardinessZoneNotSetException e) {
             throw new RuntimeException(e);
         }
         Assertions.assertTrue(testPlant.isPresent());
@@ -58,8 +63,11 @@ public class JsonPlantDatabaseTest {
     void getPlantByIdMustFail() {
         Optional<Plant> testPlant;
         try {
-            testPlant = testDatabase.getPlantById(HardinessZone.ZONE_8A,99);
+            testDatabase.getPlantList(HardinessZone.ZONE_8A);
-        } catch (IOException | HardinessZoneNotSetException e) {
+            testPlant = testDatabase.getPlantById(99);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        } catch (HardinessZoneNotSetException e) {
             throw new RuntimeException(e);
         }
         Assertions.assertFalse(testPlant.isPresent());

src/test/java/ch/zhaw/gartenverwaltung/plantList/PlantListModelTest.java

@@ -43,7 +43,6 @@ class PlantListModelTest {
                 20,
                 "summertime onion",
                 "Onion, (Allium cepa), herbaceous biennial plant in the amaryllis family (Amaryllidaceae) grown for its edible bulb. The onion is likely native to southwestern Asia but is now grown throughout the world, chiefly in the temperate zones. Onions are low in nutrients but are valued for their flavour and are used widely in cooking. They add flavour to such dishes as stews, roasts, soups, and salads and are also served as a cooked vegetable.",
-                null,
                 "15,30,2",
                 0,
                 "sandy to loamy, loose soil, free of stones",
@@ -54,7 +53,6 @@ class PlantListModelTest {
                 0,
                 "Potato",
                 "The potato is a tuber, round or oval, with small white roots called  'eyes', that are growth buds. The size varies depending on the variety; the colour of the skin can be white, yellow or even purple.",
-                null,
                 "35",
                 6,
                 "sandy",
@@ -65,7 +63,6 @@ class PlantListModelTest {
                 1,
                 "Early Carrot",
                 "Carrot, (Daucus carota), herbaceous, generally biennial plant of the Apiaceae family that produces an edible taproot. Among common varieties root shapes range from globular to long, with lower ends blunt to pointed. Besides the orange-coloured roots, white-, yellow-, and purple-fleshed varieties are known.",
-                null,
                 "5,35,2.5",
                 0,
                 "sandy to loamy, loose soil, free of stones",