More change to asStream

src/main/java/org/jabref/logic/exporter/TemplateExporter.java

@@ -1,7 +1,10 @@
 package org.jabref.logic.exporter;
 
+import java.io.BufferedReader;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.io.Reader;
 import java.net.URISyntaxException;
 import java.net.URL;
@@ -161,7 +164,7 @@ public void setCustomExport(boolean custom) {
      *
      * @param filename the filename
      * @return a newly created reader
-     * @throws IOException if the reader could not be created
+     * @throws IOException if the reader could not be created (e.g., file is not found)
      */
     private Reader getReader(String filename) throws IOException {
         // If this is a custom export, just use the given filename:
@@ -171,24 +174,24 @@ private Reader getReader(String filename) throws IOException {
         } else {
             dir = LAYOUT_PREFIX + (directory == null ? "" : directory + '/');
         }
+
         // Attempt to get a Reader for the file path given, either by
         // loading it as a resource (from within JAR), or as a normal file. If
         // unsuccessful (e.g. file not found), an IOException is thrown.
+
         String name = dir + filename;
-        // Try loading as a resource first. This works for files inside the JAR:
-        // If that did not work, try loading as a normal file URL:
-        try {
-            URL res = TemplateExporter.class.getResource(name);
-            Path reso;
-            if (res == null) {
-                reso = Path.of(name);
-            } else {
-                reso = Path.of(res.toURI());
-            }
-            return Files.newBufferedReader(reso, StandardCharsets.UTF_8);
-        } catch (FileNotFoundException | URISyntaxException ex) {
+
+        Path path = Path.of(name);
+        if (Files.exists(path)) {
+            return Files.newBufferedReader(path, StandardCharsets.UTF_8);
+        }
+
+        InputStream inputStream = TemplateExporter.class.getResourceAsStream(name);
+        if (inputStream == null) {
             throw new IOException("Cannot find layout file: '" + name + "'.");
         }
+
+        return new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8));
     }
 
     @Override

src/main/java/org/jabref/logic/net/ssl/TrustStoreManager.java

@@ -25,6 +25,7 @@
 import javax.net.ssl.TrustManagerFactory;
 import javax.net.ssl.X509TrustManager;
 
+import org.glassfish.grizzly.streams.Input;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -148,9 +149,10 @@ public static void createTruststoreFileIfNotExist(Path storePath) {
         try {
             LOGGER.debug("Trust store path: {}", storePath.toAbsolutePath());
             if (Files.notExists(storePath)) {
-                Path storeResourcePath = Path.of(TrustStoreManager.class.getResource("/ssl/truststore.jks").toURI());
                 Files.createDirectories(storePath.getParent());
-                Files.copy(storeResourcePath, storePath);
+                try (InputStream inputStream = TrustStoreManager.class.getResourceAsStream("/ssl/truststore.jks")) {
+                    Files.copy(inputStream, storePath);
+                }
             }
 
             try {
@@ -160,8 +162,6 @@ public static void createTruststoreFileIfNotExist(Path storePath) {
             }
         } catch (IOException e) {
             LOGGER.warn("Bad truststore path", e);
-        } catch (URISyntaxException e) {
-            LOGGER.warn("Bad resource path", e);
         }
     }