Updated simplelogging (#311)

* Updated simplelogging

Author: j256

pom.xml

@@ -53,10 +53,10 @@
 		<easymock-version>3.4</easymock-version>
 		<h2-version>2.2.224</h2-version>
 		<junit-version>5.10.3</junit-version>
-		<commons-lang-version>2.1</commons-lang-version>
-		<commons-logging-version>1.1.1</commons-logging-version>
-		<logback.version>1.4.12</logback.version>
-		<slf4j-version>1.7.32</slf4j-version>
+		<!-- logging test packages -->		
+		<commons-logging-version>1.2</commons-logging-version>
+		<logback.version>1.3.13</logback.version>
+		<slf4j-version>2.0.12</slf4j-version>
 		<log4j2-version>2.21.1</log4j2-version>
 	</properties>
 	<profiles>
@@ -340,6 +340,7 @@
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-simple</artifactId>
 			<version>${slf4j-version}</version>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>javax.persistence</groupId>

src/main/java/com/j256/ormlite/logger/BaseLogger.java

@@ -31,7 +31,7 @@ public BaseLogger(LogBackend backend) {
 	}
 
 	/**
-	 * Get the global log level. For testing purposes.
+	 * Get the global log level.  For testing purposes. 
 	 */
 	public static Level getGlobalLevel() {
 		return globalLevel;

src/main/java/com/j256/ormlite/logger/LoggerFactory.java

@@ -96,19 +96,6 @@ public static void setLogBackendType(LogBackendType type) {
 		}
 	}
 
-	/**
-	 * Return the single class name from a class-name string.
-	 */
-	public static String getSimpleClassName(String className) {
-		// get the last part of the class name
-		int index = className.lastIndexOf('.');
-		if (index < 0 || index == className.length() - 1) {
-			return className;
-		} else {
-			return className.substring(index + 1);
-		}
-	}
-
 	/**
 	 * Maybe assign the global log level based on the system property. Exposed for testing purposes.
 	 */

src/main/java/com/j256/ormlite/logger/PropertyUtils.java

@@ -175,7 +175,7 @@ static List<String[]> readPropertiesFile(LogBackendFactory defaultBackendFactory
 		// now try to load in properties
 		InputStream stream = propertiesInputStream;
 		if (stream == null) {
-			stream = LoggerFactory.class.getResourceAsStream(LoggerConstants.PROPERTIES_CONFIG_FILE);
+			stream = PropertyUtils.class.getResourceAsStream(LoggerConstants.PROPERTIES_CONFIG_FILE);
 			if (stream == null) {
 				// file not found
 				return Collections.emptyList();
@@ -220,7 +220,7 @@ private static String trimString(String str) {
 	}
 
 	private static void logWarning(LogBackendFactory defaultBackendFactory, String msg, Throwable th) {
-		LogBackend backend = defaultBackendFactory.createLogBackend(LoggerFactory.class.getName());
+		LogBackend backend = defaultBackendFactory.createLogBackend(PropertyUtils.class.getName());
 		if (th == null) {
 			backend.log(Level.WARNING, msg);
 		} else {

src/main/java/com/j256/ormlite/logger/backend/LocalLogBackend.java

@@ -14,7 +14,6 @@
 import com.j256.ormlite.logger.LogBackendFactory;
 import com.j256.ormlite.logger.LogBackendType;
 import com.j256.ormlite.logger.LoggerConstants;
-import com.j256.ormlite.logger.LoggerFactory;
 import com.j256.ormlite.logger.PropertyUtils;
 import com.j256.ormlite.logger.PropertyUtils.PatternLevel;
 
@@ -70,7 +69,12 @@ public class LocalLogBackend implements LogBackend {
 
 	public LocalLogBackend(String className) {
 		// get the last part of the class name
-		this.className = LoggerFactory.getSimpleClassName(className);
+		int index = className.lastIndexOf('.');
+		if (index < 0 || index == className.length() - 1) {
+			this.className = className;
+		} else {
+			this.className = className.substring(index + 1);
+		}
 
 		Level level = null;
 		if (classLevels != null) {
@@ -156,7 +160,7 @@ private void printMessage(Level level, String message, Throwable throwable) {
 
 	/**
 	 * Internal factory for LocalLogBackend instances. This can be used with the
-	 * {@link LoggerFactory#setLogBackendFactory(LogBackendFactory)} method to send all log messages to a file.
+	 * LoggerFactory.setLogBackendFactory(LogBackendFactory) method to send all log messages to a file.
 	 */
 	public static class LocalLogBackendFactory implements LogBackendFactory {
 

src/main/java/com/j256/ormlite/logger/backend/LogbackLogBackend.java

@@ -14,9 +14,9 @@
  */
 public class LogbackLogBackend implements LogBackend {
 
-	private final org.slf4j.Logger logger;
+	private final ch.qos.logback.classic.Logger logger;
 
-	public LogbackLogBackend(org.slf4j.Logger logger) {
+	public LogbackLogBackend(ch.qos.logback.classic.Logger logger) {
 		this.logger = logger;
 	}
 
@@ -98,10 +98,10 @@ public void log(Level level, String msg, Throwable t) {
 	 */
 	public static class LogbackLogBackendFactory implements LogBackendFactory {
 
-		private final org.slf4j.ILoggerFactory factory;
+		private final ch.qos.logback.classic.LoggerContext loggerContext;
 
 		public LogbackLogBackendFactory() {
-			this.factory = org.slf4j.impl.StaticLoggerBinder.getSingleton().getLoggerFactory();
+			this.loggerContext = new ch.qos.logback.classic.LoggerContext();
 		}
 
 		@Override
@@ -112,7 +112,7 @@ public boolean isAvailable() {
 
 		@Override
 		public LogBackend createLogBackend(String classLabel) {
-			return new LogbackLogBackend(factory.getLogger(classLabel));
+			return new LogbackLogBackend(loggerContext.getLogger(classLabel));
 		}
 	}
 }

src/main/java/com/j256/ormlite/logger/backend/NullLogBackend.java

@@ -3,7 +3,6 @@
 import com.j256.ormlite.logger.Level;
 import com.j256.ormlite.logger.LogBackend;
 import com.j256.ormlite.logger.LogBackendFactory;
-import com.j256.ormlite.logger.LoggerFactory;
 
 /**
  * Log backend that ignores all log requests.
@@ -36,7 +35,7 @@ public void log(Level level, String msg, Throwable throwable) {
 
 	/**
 	 * Factory for generating NullLogBackend instances. This can be used with the
-	 * {@link LoggerFactory#setLogBackendFactory(LogBackendFactory)} method to completely disable all logging.
+	 * LoggerFactory.setLogBackendFactory(LogBackendFactory) method to completely disable all logging.
 	 */
 	public static class NullLogBackendFactory implements LogBackendFactory {
 

src/test/java/com/j256/ormlite/logger/FluentLoggerTest.java

@@ -381,7 +381,7 @@ public void testAppendMsgDocs() {
 	}
 
 	@Test
-	@Disabled
+	@Disabled("Only to be run once and a while")
 	public void testPerformance() {
 		/*
 		 * Not really a fair test because hotswap might take out some of the method calls but I thought it would be

src/test/java/com/j256/ormlite/logger/LoggerFactoryTest.java

@@ -89,12 +89,12 @@ public void testLogTypeKnownLog() {
 	@Test
 	public void testGetSimpleClassName() {
 		String first = "foo";
-		assertEquals(first, LoggerFactory.getSimpleClassName(first));
+		assertEquals(first, extractSimpleClassName(first));
 		String second = "bar";
 		String className = first + "." + second;
-		assertEquals(second, LoggerFactory.getSimpleClassName(className));
+		assertEquals(second, extractSimpleClassName(className));
 		className = first + ".";
-		assertEquals(className, LoggerFactory.getSimpleClassName(className));
+		assertEquals(className, extractSimpleClassName(className));
 	}
 
 	@Test
@@ -263,6 +263,16 @@ public void testGlobalProperty() {
 		}
 	}
 
+	private String extractSimpleClassName(String className) {
+		// get the last part of the class name
+		int index = className.lastIndexOf('.');
+		if (index < 0 || index == className.length() - 1) {
+			return className;
+		} else {
+			return className.substring(index + 1);
+		}
+	}
+
 	public static class OurLogFactory implements LogBackendFactory {
 
 		LogBackend log;