Merge branch 'dev' into feature_weather

2022-12-05 11:40:53 +01:00
parent 28f76e7a04 92ee656a5d
commit d119fd1331
1 changed files with 3 additions and 7 deletions
@@ -21,13 +21,9 @@ public class PlantImageDeserializer extends JsonDeserializer<Image> {
    @Override
    public Image deserialize(JsonParser parser, DeserializationContext context) throws IOException {
        Image result = null;
-        URL imageUrl = PlantList.class.getResource(String.format("images/%s", parser.getText()));
-        if (imageUrl != null) {
-            try (InputStream is = new FileInputStream(new File(imageUrl.toURI()))) {
-                result = new Image(is);
-            } catch (IllegalArgumentException | URISyntaxException e) {
-                throw new IOException(String.format("Cannot find Image \"%s\"\n", imageUrl.getFile()));
-            }
+        InputStream is = PlantList.class.getResourceAsStream(String.format("images/%s", parser.getText()));
+        if (is != null) {
+            result = new Image(is);
        }
        return result;
    }