fixed imageResource processing on windows

treblereel · Oct 3, 2023 · ab9349d · ab9349d
1 parent 7ee44a9
commit ab9349d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/.../main/java/org/treblereel/j2cl/processors/generator/resources/ImageResourceGenerator.java b/.../main/java/org/treblereel/j2cl/processors/generator/resources/ImageResourceGenerator.java
@@ -24,6 +24,7 @@
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -56,8 +57,8 @@ void initializer(Map<String, Object> root, TypeElement clientBundle, ExecutableE
     definition.put("name", method.getSimpleName().toString());
 
     URL resource = getResource(method, defaultExtensions.value());
-    Path imagePath = Paths.get(resource.getPath());
     try {
+      Path imagePath = Paths.get(resource.toURI());
       String mimeType = String.format("data:%s;base64,", Files.probeContentType(imagePath));
       setSize(method, imagePath, definition);
 
@@ -76,7 +77,9 @@ void initializer(Map<String, Object> root, TypeElement clientBundle, ExecutableE
         throw new GenerationException(e);
       }
     } catch (IOException e) {
-      throw new GenerationException("Unable to determine mime type for " + imagePath, e);
+      throw new GenerationException("Unable to determine mime type for " + resource, e);
+    } catch (URISyntaxException e) {
+      throw new GenerationException("Unable to determine mime type for " + resource, e);
     }
   }
 

diff --git a/tests/resources/src/test/java/org/treblereel/j2cl/processors/test/TextResourcesTest.java b/tests/resources/src/test/java/org/treblereel/j2cl/processors/test/TextResourcesTest.java
@@ -19,7 +19,9 @@
 import static org.junit.Assert.assertEquals;
 
 import java.io.IOException;
+import java.net.URISyntaxException;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 import org.junit.Test;
 
@@ -56,11 +58,13 @@ public void testNoSource() {
   }
 
   private String readFileAsString(String fileName) {
-    String file = this.getClass().getResource(fileName).getPath();
     try {
-      return new String(Files.readAllBytes(Paths.get(file)));
+      Path file = Paths.get(this.getClass().getResource(fileName).toURI());
+      return new String(Files.readAllBytes(file));
     } catch (IOException e) {
-      throw new RuntimeException(e);
+        throw new RuntimeException(e);
+    } catch (URISyntaxException e) {
+        throw new RuntimeException(e);
     }
   }
 }