NativeUtils: changed a way to collect java.library.path. Added extended info on UnsatisfiedLinkError

Author: rssdev10

src/main/java/org/julia/jni/NativeUtils.java

@@ -23,15 +23,16 @@
  */
 package org.julia.jni;
 
-import java.io.*;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
 import java.lang.reflect.Field;
-import java.nio.file.FileSystemNotFoundException;
-import java.nio.file.FileSystems;
-import java.nio.file.Files;
-import java.nio.file.ProviderNotFoundException;
-import java.nio.file.StandardCopyOption;
+import java.nio.file.*;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * A simple library class which helps with loading dynamic libraries stored in the
@@ -76,7 +77,8 @@ private NativeUtils() {
      * (restriction of {@link File#createTempFile(java.lang.String, java.lang.String)}).
      * @throws FileNotFoundException If the file could not be found inside the JAR.
      */
-    public static void loadLibraryFromJar(String path) throws IOException {
+    public static void loadLibraryFromJar(String path, String libraryPaths) throws IOException {
+        setupJavaLibraryPaths(libraryPaths);
 
         if (null == path || !path.startsWith("/")) {
             throw new IllegalArgumentException("The path has to be absolute (start with '/').");
@@ -109,9 +111,12 @@ public static void loadLibraryFromJar(String path) throws IOException {
             throw new FileNotFoundException("File " + path + " was not found inside JAR.");
         }
 
-        checkJavaLibraryPath();
         try {
             System.load(temp.getAbsolutePath());
+        } catch (UnsatisfiedLinkError e) {
+            throw new UnsatisfiedLinkError(
+                    String.format("%s\njava.library.path=%s\n",
+                    e.getMessage(), System.getProperty(JAVA_LIBRARY_PATH)));
         } finally {
             if (isPosixCompliant()) {
                 // Assume POSIX compliant file system, can be deleted after loading
@@ -123,6 +128,10 @@ public static void loadLibraryFromJar(String path) throws IOException {
         }
     }
 
+    public static void loadLibraryFromJar(String path) throws IOException {
+        loadLibraryFromJar(path, "");
+    }
+
     private static boolean isPosixCompliant() {
         try {
             return FileSystems.getDefault()
@@ -185,15 +194,23 @@ public static List<String> loadedLibraryNames() {
         return Collections.emptyList();
     }
 
-    private static void checkJavaLibraryPath() {
+    private static void setupJavaLibraryPaths(String externalPaths) {
         String javaLibraryPath = System.getProperty(JAVA_LIBRARY_PATH);
         String javaHome = System.getProperty("java.home");
-        if (!javaLibraryPath.contains(javaHome)) {
+//        if (!javaLibraryPath.contains(javaHome)) {
+        String javaLibPath = javaHome + File.separator + "lib";
+            final List<String> newSysPaths =
+                    new ArrayList<>(List.of(javaLibraryPath.split(File.pathSeparator)));
+            newSysPaths.add(javaLibPath);
+            newSysPaths.add(javaLibPath + File.separator + "server");
+            newSysPaths.addAll(List.of(externalPaths.split(File.pathSeparator)));
+
             System.setProperty(JAVA_LIBRARY_PATH,
-                    javaLibraryPath + File.pathSeparator
-                            + javaHome + File.separator + "lib"
+                    newSysPaths.stream()
+                            .filter(s -> !s.isEmpty())
+                            .distinct()
+                            .collect(Collectors.joining(File.pathSeparator))
             );
-        }
-        System.out.println(System.getProperty(JAVA_LIBRARY_PATH));
+//        }
     }
 }