Remove SciJava Common dependency from SciJava Log2

gselzer · ctrueden · commit 7e9ae814451e · 2022-06-30T14:46:59.000-05:00
diff --git a/scijava/scijava-log2/pom.xml b/scijava/scijava-log2/pom.xml
@@ -92,11 +92,6 @@
 		<allowedDuplicateClasses>${scijava-log2.allowedDuplicateClasses}</allowedDuplicateClasses>
 	</properties>
 	<dependencies>
-		<dependency>
-			<groupId>org.scijava</groupId>
-			<artifactId>scijava-common</artifactId>
-		</dependency>
-
 		<!-- Test scope dependencies -->
 		<dependency>
 			<groupId>junit</groupId>
diff --git a/scijava/scijava-log2/src/main/java/module-info.java b/scijava/scijava-log2/src/main/java/module-info.java
@@ -2,6 +2,5 @@
 
 	opens org.scijava.log2 to org.scijava;
 	exports org.scijava.log2;
-	requires org.scijava;
 
 }
diff --git a/scijava/scijava-log2/src/main/java/org/scijava/log2/AbstractLoggerFactory.java b/scijava/scijava-log2/src/main/java/org/scijava/log2/AbstractLoggerFactory.java
@@ -30,7 +30,7 @@
 package org.scijava.log2;
 
 /**
- * Base class for {@link LogService} implementations.
+ * Base class for {@link LoggerFactory} implementations.
  *
  * @author Johannes Schindelin
  * @author Curtis Rueden
diff --git a/scijava/scijava-log2/src/main/java/org/scijava/log2/CallingClassUtils.java b/scijava/scijava-log2/src/main/java/org/scijava/log2/CallingClassUtils.java
@@ -29,8 +29,6 @@
 
 package org.scijava.log2;
 
-import org.scijava.Context;
-
 /**
  * Utility class for getting the calling class of a method.
  *
@@ -62,14 +60,29 @@ public static String getCallingClassName() {
 
 	private static boolean hasIgnoreAsCallingClassAnnotation(String className) {
 		try {
-			Class< ? > clazz = Context.getClassLoader().loadClass(className);
+			Class< ? > clazz = getClassLoader().loadClass(className);
 			return clazz.isAnnotationPresent(IgnoreAsCallingClass.class);
 		}
 		catch (ClassNotFoundException ignore) {
 			return false;
 		}
 	}
 
+	/**
+	 * Gets the class loader to use. This will be the current thread's context
+	 * class loader if non-null; otherwise it will be the system class loader.
+	 * <p>
+	 * Forked from SciJava Common's Context class.
+	 *
+	 * @see Thread#getContextClassLoader()
+	 * @see ClassLoader#getSystemClassLoader()
+	 */
+	private static ClassLoader getClassLoader() {
+		final ClassLoader contextCL = Thread.currentThread()
+				.getContextClassLoader();
+		return contextCL != null ? contextCL : ClassLoader.getSystemClassLoader();
+	}
+
 	/**
 	 * @deprecated Use {@link #getCallingClassName()} instead.
 	 *
diff --git a/scijava/scijava-log2/src/main/java/org/scijava/log2/DefaultUncaughtExceptionHandler.java b/scijava/scijava-log2/src/main/java/org/scijava/log2/DefaultUncaughtExceptionHandler.java
@@ -45,9 +45,9 @@ public class DefaultUncaughtExceptionHandler implements
 	UncaughtExceptionHandler
 {
 
-	private final LogService log;
+	private final Logger log;
 
-	public DefaultUncaughtExceptionHandler(final LogService log) {
+	public DefaultUncaughtExceptionHandler(final Logger log) {
 		this.log = log;
 	}
 
@@ -62,7 +62,7 @@ public void handle(final Exception exception) {
 		log.error("Uncaught exception on the Event Dispatch Thread", exception);
 	}
 
-	public static void install(final LogService log) {
+	public static void install(final Logger log) {
 		final UncaughtExceptionHandler handler =
 			new DefaultUncaughtExceptionHandler(log);
 		Thread.setDefaultUncaughtExceptionHandler(handler);
diff --git a/scijava/scijava-log2/src/main/java/org/scijava/log2/LogMessage.java b/scijava/scijava-log2/src/main/java/org/scijava/log2/LogMessage.java
@@ -36,14 +36,11 @@
 import java.util.Date;
 import java.util.LinkedList;
 
-import org.scijava.event.EventService;
-
 /**
  * A log message broadcast by a {@link Logger}.
  * <p>
  * NB: The message is published <em>on the calling thread</em> by
- * {@link Logger#notifyListeners}, <em>not</em> on a dedicated event dispatch
- * thread by the {@link EventService}. This is done to avoid the overhead of the
+ * {@link Logger#notifyListeners}. This is done to avoid the overhead of the
  * event service's synchronized pub/sub implementation, as well as to avoid
  * potential infinite loops caused by debugging log messages surrounding event
  * publication.
diff --git a/scijava/scijava-log2/src/main/java/org/scijava/log2/LogService.java b/scijava/scijava-log2/src/main/java/org/scijava/log2/LogService.java
diff --git a/scijava/scijava-log2/src/main/java/org/scijava/log2/Logged.java b/scijava/scijava-log2/src/main/java/org/scijava/log2/Logged.java
@@ -36,7 +36,6 @@
  */
 public interface Logged {
 
-	/** Gets the {@link LogService} to use when logging activities. */
-	// TODO: SJC3: Generalize to Logger instead of LogService.
-	LogService log();
+	/** Gets the {@link Logger} to use when logging activities. */
+	Logger log();
 }
diff --git a/scijava/scijava-log2/src/main/java/org/scijava/log2/Logger.java b/scijava/scijava-log2/src/main/java/org/scijava/log2/Logger.java
@@ -44,7 +44,6 @@
  * 
  * @author Curtis Rueden
  * @see LogLevel
- * @see LogService
  */
 @IgnoreAsCallingClass
 public interface Logger {
diff --git a/scijava/scijava-log2/src/main/java/org/scijava/log2/StderrLogFactory.java b/scijava/scijava-log2/src/main/java/org/scijava/log2/StderrLogFactory.java
@@ -33,7 +33,7 @@
 import java.util.function.Function;
 
 /**
- * Implementation of {@link LogService} using the standard error stream.
+ * Implementation of {@link LoggerFactory} using the standard error stream.
  * <p>
  * Actually, this service is somewhat misnamed now, since it prints {@code WARN}
  * and {@code ERROR} messages to stderr, but messages at lesser severities to
diff --git a/scijava/scijava-types/pom.xml b/scijava/scijava-types/pom.xml
@@ -92,10 +92,6 @@
 
 	<dependencies>
 		<!-- SciJava dependencies -->
-		<dependency>
-			<groupId>org.scijava</groupId>
-			<artifactId>scijava-common</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.scijava</groupId>
 			<artifactId>scijava-discovery</artifactId>

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,5 @@`
`2`	`2`
`3`	`3`	`opens org.scijava.log2 to org.scijava;`
`4`	`4`	`exports org.scijava.log2;`
`5`		`- requires org.scijava;`
`6`	`5`
`7`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`package org.scijava.log2;`
`31`	`31`
`32`	`32`	`/**`
`33`		`- * Base class for {@link LogService} implementations.`
	`33`	`+ * Base class for {@link LoggerFactory} implementations.`
`34`	`34`	`*`
`35`	`35`	`* @author Johannes Schindelin`
`36`	`36`	`* @author Curtis Rueden`
Original file line number	Diff line number	Diff line change
`@@ -45,9 +45,9 @@ public class DefaultUncaughtExceptionHandler implements`
`45`	`45`	`UncaughtExceptionHandler`
`46`	`46`	`{`
`47`	`47`
`48`		`- private final LogService log;`
	`48`	`+ private final Logger log;`
`49`	`49`
`50`		`- public DefaultUncaughtExceptionHandler(final LogService log) {`
	`50`	`+ public DefaultUncaughtExceptionHandler(final Logger log) {`
`51`	`51`	`this.log = log;`
`52`	`52`	`}`
`53`	`53`
`@@ -62,7 +62,7 @@ public void handle(final Exception exception) {`
`62`	`62`	`log.error("Uncaught exception on the Event Dispatch Thread", exception);`
`63`	`63`	`}`
`64`	`64`
`65`		`- public static void install(final LogService log) {`
	`65`	`+ public static void install(final Logger log) {`
`66`	`66`	`final UncaughtExceptionHandler handler =`
`67`	`67`	`new DefaultUncaughtExceptionHandler(log);`
`68`	`68`	`Thread.setDefaultUncaughtExceptionHandler(handler);`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,6 @@`
`36`	`36`	`*/`
`37`	`37`	`public interface Logged {`
`38`	`38`
`39`		`- /** Gets the {@link LogService} to use when logging activities. */`
`40`		`- // TODO: SJC3: Generalize to Logger instead of LogService.`
`41`		`- LogService log();`
	`39`	`+ /** Gets the {@link Logger} to use when logging activities. */`
	`40`	`+ Logger log();`
`42`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,6 @@`
`44`	`44`	`*`
`45`	`45`	`* @author Curtis Rueden`
`46`	`46`	`* @see LogLevel`
`47`		`- * @see LogService`
`48`	`47`	`*/`
`49`	`48`	`@IgnoreAsCallingClass`
`50`	`49`	`public interface Logger {`