switch to slf4j

Author: JuicyDragon

IntelliJ/build.gradle.kts

@@ -2,7 +2,7 @@ plugins {
     id("java")
 }
 
-group = "com.nuix.enginebaseline"
+group = "com.nuix.engine-baseline"
 version = "9.10"
 
 val sourceCompatibility = 11
@@ -37,7 +37,7 @@ dependencies {
 
     implementation(fileTree(baseDir = engineLibDir) {
         include(
-                "**/*log*.jar",
+                "**/*slf4j*.jar",
                 "**/*joda*.jar",
                 "**/*commons*.jar",
                 "**/*guava*.jar",

IntelliJ/engine/README.TXT

@@ -10,16 +10,16 @@
 import javax.management.MBeanServerFactory;
 import javax.management.ObjectName;
 
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
 import org.joda.time.DateTime;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /***
  * Provides methods for generating Nuix diagnostics files.
  * @author Jason Wells
  */
 public class NuixDiagnostics {
-	private final static Logger logger = LogManager.getLogger(NuixDiagnostics.class);
+	private final static Logger logger = LoggerFactory.getLogger(NuixDiagnostics.class);
 
 	/***
 	 * Saves a Nuix diagnostics zip file at the specified path.

IntelliJ/src/main/java/com/nuix/enginebaseline/NuixDiagnostics.java

@@ -7,14 +7,9 @@
 import nuix.engine.Engine;
 import nuix.engine.GlobalContainer;
 import nuix.engine.GlobalContainerFactory;
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.core.LifeCycle;
-import org.apache.logging.log4j.core.LoggerContext;
-import org.apache.logging.log4j.core.config.Configuration;
-import org.apache.logging.log4j.core.config.LoggerConfig;
 import org.joda.time.DateTime;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
@@ -453,14 +448,12 @@ protected void initializeLogging() {
             // Use Log4j2 config YAML from engine base directory
             File log4jConfigFile = new File(engineDistributionDirectorySupplier.get(), "config/log4j2.yml");
             System.setProperty("log4j.configurationFile", log4jConfigFile.getAbsolutePath());
-            log = LogManager.getLogger(this.getClass());
+            log = LoggerFactory.getLogger(this.getClass());
 
             // Set default level to INFO
-            LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
-            Configuration config = ctx.getConfiguration();
-            LoggerConfig loggerConfig = config.getLoggerConfig(LogManager.ROOT_LOGGER_NAME);
-            loggerConfig.setLevel(Level.INFO);
-            ctx.updateLoggers();
+            // Set default level to INFO
+            org.apache.log4j.Logger logger4j = org.apache.log4j.Logger.getRootLogger();
+            logger4j.setLevel(org.apache.log4j.Level.toLevel("INFO"));
         }
     }
 
@@ -593,11 +586,5 @@ public void close() throws Exception {
             Runtime.getRuntime().removeShutdownHook(shutdownHook);
             shutdownHook = null;
         }
-
-        // Shutdown logging
-        if (log != null) {
-            ((LifeCycle) LogManager.getContext()).stop();
-            log = null;
-        }
     }
 }

IntelliJ/src/main/java/com/nuix/enginebaseline/NuixEngine.java

@@ -3,8 +3,8 @@
 import nuix.Licence;
 import nuix.LicenceProperties;
 import nuix.engine.AvailableLicence;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.StringJoiner;
 
@@ -14,7 +14,7 @@
  */
 public class NuixLicenseFeaturesLogger {
     // Obtain a logger instance for this class
-    private final static Logger logger = LogManager.getLogger("LicenseFeatures");
+    private final static Logger logger = LoggerFactory.getLogger("LicenseFeatures");
 
     // List of license features copied from 9.10 license profiles documentation
     private static final String[] knownFeatures = new String[]{

IntelliJ/src/main/java/com/nuix/enginebaseline/NuixLicenseFeaturesLogger.java

@@ -3,8 +3,8 @@
 import lombok.NonNull;
 import nuix.LicenceProperties;
 import nuix.engine.*;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.*;
 import java.util.function.Function;
@@ -55,7 +55,7 @@
  * @author Jason Wells
  */
 public class NuixLicenseResolver implements LicenseResolver {
-    private static final Logger log = LogManager.getLogger(NuixLicenseResolver.class);
+    private static final Logger log = LoggerFactory.getLogger(NuixLicenseResolver.class);
 
     /***
      * An enum with options about how this license resolver should locate its license.
@@ -365,10 +365,10 @@ public boolean resolveLicense(@NonNull Engine engine) throws Exception {
             }
 
             // Get the number of workers this license has to offer
-            int availableWorkerCount = ((LicenceProperties) availableLicense).getWorkers();
+            Integer availableWorkerCount = ((LicenceProperties) availableLicense).getWorkers();
 
             // Verify the minimum worker count
-            if (minWorkerCount > 0 && availableWorkerCount < minWorkerCount) {
+            if (availableWorkerCount != null && minWorkerCount > 0 && availableWorkerCount < minWorkerCount) {
                 log.info(String.format("License has %s workers, filter specifies a minimum of %s, ignoring this license",
                         availableWorkerCount, minWorkerCount));
                 return false;

IntelliJ/src/main/java/com/nuix/enginebaseline/NuixLicenseResolver.java

@@ -1,10 +1,10 @@
 import com.nuix.enginebaseline.NuixEngine;
 import com.nuix.enginebaseline.NuixLicenseResolver;
 import org.apache.commons.io.FileUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
@@ -43,7 +43,7 @@ public TermCount(String term, long count) {
     @BeforeAll
     public static void setup() throws Exception {
         TestData.init();
-        log = LogManager.getLogger("Tests");
+        log = LoggerFactory.getLogger("Tests");
         testOutputDirectory = new File(System.getenv("TEST_OUTPUT_DIRECTORY"));
         Runtime.getRuntime().addShutdownHook(new Thread(() -> {
             if (deleteTestOutputOnCompletion) {

IntelliJ/src/test/java/CommonTestFunctionality.java

@@ -5,8 +5,8 @@
 import org.apache.commons.collections4.set.ListOrderedSet;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
@@ -18,7 +18,7 @@
  * A class for generating random data.
  */
 public class FakeDataGenerator {
-    private static final Logger log = LogManager.getLogger(FakeDataGenerator.class);
+    private static final Logger log = LoggerFactory.getLogger(FakeDataGenerator.class);
     public static final int seed = 1234567890;
     public static final Faker faker = new Faker(new Random(seed));
     public static final Gson gson = new GsonBuilder().serializeNulls().setPrettyPrinting().create();

IntelliJ/src/test/java/FakeDataGenerator.java

@@ -1,8 +1,8 @@
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
 import org.apache.commons.io.FileUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
@@ -16,7 +16,7 @@
  * path to existing test data if it has already been created.
  */
 public class TestData {
-    private static final Logger log = LogManager.getLogger(TestData.class);
+    private static final Logger log = LoggerFactory.getLogger(TestData.class);
     private static File testDataDirectory = new File(System.getenv("TEST_DATA_DIRECTORY"));
 
     public static void init() {