Use nuix.userDataBase when none provided via direct method

Author: JuicyDragon

IntelliJ/src/main/java/com/nuix/innovation/enginewrapper/NuixEngine.java

@@ -380,7 +380,7 @@ private boolean obtainLicenseFromResolvers() throws Exception {
     private void checkPreConditions() throws Exception {
         // This is for testing!
         boolean ignoreIssues = false;
-        if (System.getProperty("engine.ignore.preCheckIssues").equalsIgnoreCase("true")) {
+        if (System.getProperty("engine.ignore.preCheckIssues", "false").equalsIgnoreCase("true")) {
             ignoreIssues = true;
             System.out.println("engine.ignore.preCheckIssues = true, ignoring errors found during pre-check!");
         }
@@ -439,12 +439,18 @@ private void checkPreConditions() throws Exception {
             }
         }
 
-        // If caller has not specified a user-data directory, assume the one that comes with the engine distribution
-        // that is being used.
+        // If caller has not specified a user-data directory directly, check to see if one was specified in system property
+        // nuix.userDataDirs.  If not specified there, then use the one specified in the engine release directory.
         if (userDataDirectorySupplier == null) {
-            System.out.println("No user data directory was specified, assuming directory relative to engine distribution: " +
-                    new File(engineDistributionDirectorySupplier.get(), "user-data").getAbsolutePath());
-            userDataDirectorySupplier = () -> new File(engineDistributionDirectorySupplier.get(), "user-data");
+            String userDataDirProp = System.getProperty("nuix.userDataBase");
+            if (userDataDirProp != null && !userDataDirProp.isBlank()) {
+                System.out.println("Using user data directory provided in property 'nuix.userDataBase': " + userDataDirProp);
+                userDataDirectorySupplier = () -> new File(userDataDirProp);
+            } else {
+                System.out.println("No user data directory was specified, assuming directory relative to engine distribution: " +
+                        new File(engineDistributionDirectorySupplier.get(), "user-data").getAbsolutePath());
+                userDataDirectorySupplier = () -> new File(engineDistributionDirectorySupplier.get(), "user-data");
+            }
         }
 
         // Make sure PATH points to expected bin and bin/x86 subdirectories of our engine distribution

IntelliJ/src/test/java/BasicTests.java

@@ -3,6 +3,7 @@
 import org.junit.jupiter.api.Test;
 
 import java.io.File;
+import java.nio.file.Paths;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -45,6 +46,19 @@ public void GetLicenseManualCleanup() throws Exception {
         nuixEngine.close();
     }
 
+    @Test
+    public void OverrideUserDataViaProperty() throws Exception {
+        File engineUserDataBase = Paths.get(System.getenv("NUIX_ENGINE_DIR"), "user-data").toFile();
+        System.setProperty("nuix.userDataBase", engineUserDataBase.getCanonicalPath());
+        AtomicBoolean licenseWasObtained = new AtomicBoolean(false);
+        NuixEngine nuixEngine = constructNuixEngine();
+        // run method will call close before returning
+        nuixEngine.run((utilities -> {
+            licenseWasObtained.set(true);
+        }));
+        assertTrue(licenseWasObtained.get());
+    }
+
     @Test
     public void CreateAndOpenSimpleCase() throws Exception {
         File caseDirectory = new File(testOutputDirectory, "CreateAndOpenSimpleCase");