Applied API changes

Author: pavly-gerges

snaploader/src/main/java/electrostatic4j/snaploader/NativeBinaryLoader.java

@@ -32,7 +32,9 @@
 
 package electrostatic4j.snaploader;
 
+import java.io.File;
 import java.io.IOException;
+import java.nio.file.FileSystems;
 import java.util.Arrays;
 import java.util.List;
 import java.util.jar.JarFile;
@@ -45,6 +47,8 @@
 import electrostatic4j.snaploader.library.LibraryLocator;
 import electrostatic4j.snaploader.platform.NativeDynamicLibrary;
 import electrostatic4j.snaploader.platform.util.NativeVariant;
+import electrostatic4j.snaploader.platform.util.PropertiesControllerNamespace;
+import electrostatic4j.snaploader.platform.util.PropertiesController;
 import electrostatic4j.snaploader.throwable.LoadingRetryExhaustionException;
 import electrostatic4j.snaploader.throwable.UnSupportedSystemError;
 import electrostatic4j.snaploader.util.CallingStackMetaData;
@@ -89,11 +93,15 @@ public class NativeBinaryLoader {
 
     protected int numberOfLoadingFailure = 0;
 
+    private LoadingCriterion loadingCriterion; // cache the loading criterion for system controller use
+
     /**
      * Instantiates a native dynamic library loader to extract and load a system-specific native dynamic library.
      */
     public NativeBinaryLoader(final LibraryInfo libraryInfo) {
         this.libraryInfo = libraryInfo;
+        // initialize the system controller object
+        PropertiesControllerNamespace.systemDirectoryController.initialize();
     }
 
     /**
@@ -176,14 +184,17 @@ public NativeBinaryLoader loadLibrary(LoadingCriterion criterion) throws Excepti
         }
         // commands and loads the library from the system directories
         if (NativeVariant.Os.isAndroid() || criterion == LoadingCriterion.SYSTEM_LOAD) {
-            loadSystemBinary();
+            loadSystemBinary(nativeDynamicLibrary);
+            loadingCriterion = LoadingCriterion.SYSTEM_LOAD;
             return this;
         }
         if (criterion == LoadingCriterion.INCREMENTAL_LOADING && nativeDynamicLibrary.isExtracted()) {
             loadBinary(nativeDynamicLibrary, criterion);
+            loadingCriterion = LoadingCriterion.INCREMENTAL_LOADING;
             return this;
         }
         cleanExtractBinary(nativeDynamicLibrary);
+        loadingCriterion = LoadingCriterion.CLEAN_EXTRACTION;
         return this;
     }
 
@@ -196,6 +207,10 @@ public NativeDynamicLibrary getNativeDynamicLibrary() {
         return nativeDynamicLibrary;
     }
 
+    public PropertiesController getSystemDirectoryController() {
+        return PropertiesControllerNamespace.systemDirectoryController;
+    }
+
     /**
      * Enables the logging for this object, default value is false.
      *
@@ -271,12 +286,27 @@ public NativeBinaryLoader setMaxNumberOfLoadingFailure(int maxNumberOfLoadingFai
     }
 
     /**
-     * Loads a native binary from the system directories into the process virtual
+     * Loads a native binary from the customized system directories into the process virtual
      * address space using the library basename in a platform-dependent way.
      */
-    protected void loadSystemBinary() {
+    protected void loadSystemBinary(NativeDynamicLibrary dynamicLibrary) {
+        SnapLoaderLogger.log(Level.INFO, getClass().getName(), "loadSystemBinary", "Loading library from the system: "
+                    + Arrays.toString(PropertiesControllerNamespace.systemDirectoryController.toList()));
         try {
-            System.loadLibrary(libraryInfo.getBaseName());
+            // use custom system directories for desktop ONLY!
+            if (NativeVariant.Os.isDesktop()) {
+                PropertiesControllerNamespace.systemDirectoryController.iterate(path -> {
+                    final File lib = new File(FileSystems.getDefault()
+                            .getPath(path.toString(),
+                                    dynamicLibrary.getLibraryFile()).toString());
+                    if (lib.exists()) {
+                        System.load(lib.getAbsolutePath());
+                    }
+                    return "";
+                });
+            } else {
+                System.loadLibrary(libraryInfo.getBaseName());
+            }
             SnapLoaderLogger.log(Level.INFO, getClass().getName(), "loadSystemBinary", "Successfully loaded library from the system: "
                     + libraryInfo.getBaseName());
             if (nativeBinaryLoadingListener != null) {

snaploader/src/main/java/electrostatic4j/snaploader/filesystem/DirectoryPath.java

@@ -32,7 +32,7 @@
 
 package electrostatic4j.snaploader.filesystem;
 
-import electrostatic4j.snaploader.platform.util.PropertiesProvider;
+import electrostatic4j.snaploader.platform.util.DefaultPropertiesProvider;
 
 /**
  * A class denotes and provides a directory absolute path.
@@ -45,13 +45,13 @@ public final class DirectoryPath {
      * An alias object for the current working directory absolute path.
      */
     public static final DirectoryPath USER_DIR =
-            new DirectoryPath(PropertiesProvider.USER_DIR.getSystemProperty());
+            new DirectoryPath(DefaultPropertiesProvider.USER_DIR.getSystemProperty());
 
     /**
      * An alias object for the root user home directory absolute path.
      */
     public static final DirectoryPath USER_HOME =
-            new DirectoryPath(PropertiesProvider.USER_HOME.getSystemProperty());
+            new DirectoryPath(DefaultPropertiesProvider.USER_HOME.getSystemProperty());
 
     /**
      * When combined with the
@@ -85,7 +85,7 @@ public DirectoryPath(final String root, final String... entries) {
             if (entry == null) {
                 continue;
             }
-            path = getPath() + PropertiesProvider.FILE_SEPARATOR.getSystemProperty() + entry;
+            path = getPath() + DefaultPropertiesProvider.FILE_SEPARATOR.getSystemProperty() + entry;
         }
     }