Merge pull request #949 from jeffgbutler/just-info-logging

jeffgbutler · web-flow · commit a80dcd43d6b7 · 2023-01-13T14:55:37.000-05:00
Add Info Logging Level
diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/logging/Log.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/logging/Log.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2006-2022 the original author or authors.
+ *    Copyright 2006-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -26,4 +26,6 @@ public interface Log {
     void debug(String s);
 
     void warn(String s);
+
+    void info(String s);
 }
diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/logging/commons/JakartaCommonsLoggingImpl.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/logging/commons/JakartaCommonsLoggingImpl.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2006-2022 the original author or authors.
+ *    Copyright 2006-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -51,4 +51,8 @@ public void warn(String s) {
         log.warn(s);
     }
 
+    @Override
+    public void info(String s) {
+        log.info(s);
+    }
 }
diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/logging/jdk14/Jdk14LoggingImpl.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/logging/jdk14/Jdk14LoggingImpl.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2006-2022 the original author or authors.
+ *    Copyright 2006-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -53,4 +53,8 @@ public void warn(String s) {
         log.log(Level.WARNING, s);
     }
 
+    @Override
+    public void info(String s) {
+        log.log(Level.INFO, s);
+    }
 }
diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/logging/log4j2/Log4j2AbstractLoggerImpl.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/logging/log4j2/Log4j2AbstractLoggerImpl.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2006-2022 the original author or authors.
+ *    Copyright 2006-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -62,4 +62,8 @@ public void warn(String s) {
         log.logIfEnabled(FQCN, Level.WARN, MARKER, (Message) new SimpleMessage(s), null);
     }
 
+    @Override
+    public void info(String s) {
+        log.logIfEnabled(FQCN, Level.INFO, MARKER, (Message) new SimpleMessage(s), null);
+    }
 }
diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/logging/log4j2/Log4j2Impl.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/logging/log4j2/Log4j2Impl.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2006-2022 the original author or authors.
+ *    Copyright 2006-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -59,4 +59,8 @@ public void warn(String s) {
         log.warn(s);
     }
 
+    @Override
+    public void info(String s) {
+        log.info(s);
+    }
 }
diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/logging/log4j2/Log4j2LoggerImpl.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/logging/log4j2/Log4j2LoggerImpl.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2006-2022 the original author or authors.
+ *    Copyright 2006-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -56,4 +56,8 @@ public void warn(String s) {
         log.warn(MARKER, s);
     }
 
+    @Override
+    public void info(String s) {
+        log.info(MARKER, s);
+    }
 }
diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/logging/nologging/NoLoggingImpl.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/logging/nologging/NoLoggingImpl.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2006-2022 the original author or authors.
+ *    Copyright 2006-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -48,4 +48,8 @@ public void warn(String s) {
         // Do Nothing
     }
 
+    @Override
+    public void info(String s) {
+        // Do Nothing
+    }
 }
diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/logging/slf4j/Slf4jImpl.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/logging/slf4j/Slf4jImpl.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2006-2022 the original author or authors.
+ *    Copyright 2006-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -69,4 +69,8 @@ public void warn(String s) {
         log.warn(s);
     }
 
+    @Override
+    public void info(String s) {
+        log.info(s);
+    }
 }
diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/logging/slf4j/Slf4jLocationAwareLoggerImpl.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/logging/slf4j/Slf4jLocationAwareLoggerImpl.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2006-2022 the original author or authors.
+ *    Copyright 2006-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -58,4 +58,8 @@ public void warn(String s) {
         logger.log(MARKER, FQCN, LocationAwareLogger.WARN_INT, s, null, null);
     }
 
+    @Override
+    public void info(String s) {
+        logger.log(MARKER, FQCN, LocationAwareLogger.INFO_INT, s, null, null);
+    }
 }
diff --git a/core/mybatis-generator-core/src/main/java/org/mybatis/generator/logging/slf4j/Slf4jLoggerImpl.java b/core/mybatis-generator-core/src/main/java/org/mybatis/generator/logging/slf4j/Slf4jLoggerImpl.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2006-2022 the original author or authors.
+ *    Copyright 2006-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -51,4 +51,8 @@ public void warn(String s) {
         log.warn(s);
     }
 
+    @Override
+    public void info(String s) {
+        log.info(s);
+    }
 }
diff --git a/core/mybatis-generator-core/src/site/xhtml/whatsNew.xhtml b/core/mybatis-generator-core/src/site/xhtml/whatsNew.xhtml
@@ -36,6 +36,10 @@
   <li>The Maven plugin now includes an integration with Eclipse Maven support. If you import a Maven project with the 
     generator configured into an Eclipse workspace, the code generator will run automatically.
   </li>
+  <li>Added an "info" logging level to the log abstraction. Also removed the broken Maven logging implementation.
+      Logging should now work as expected in Maven - Maven ships with the SLF4J simple logger in the classpath, so
+      configuring logging in Maven will always use the SLF simple logger.
+  </li>
 </ul>
 
 
diff --git a/core/mybatis-generator-maven-plugin/src/main/java/org/mybatis/generator/maven/MavenLogFactory.java b/core/mybatis-generator-maven-plugin/src/main/java/org/mybatis/generator/maven/MavenLogFactory.java
diff --git a/core/mybatis-generator-maven-plugin/src/main/java/org/mybatis/generator/maven/MavenLogImpl.java b/core/mybatis-generator-maven-plugin/src/main/java/org/mybatis/generator/maven/MavenLogImpl.java
diff --git a/core/mybatis-generator-maven-plugin/src/main/java/org/mybatis/generator/maven/MyBatisGeneratorMojo.java b/core/mybatis-generator-maven-plugin/src/main/java/org/mybatis/generator/maven/MyBatisGeneratorMojo.java
@@ -43,7 +43,6 @@
 import org.mybatis.generator.internal.util.ClassloaderUtility;
 import org.mybatis.generator.internal.util.StringUtility;
 import org.mybatis.generator.internal.util.messages.Messages;
-import org.mybatis.generator.logging.LogFactory;
 
 /**
  * Goal which generates MyBatis artifacts.
@@ -164,8 +163,6 @@ public void execute() throws MojoExecutionException {
 
         saveClassLoader();
 
-        LogFactory.setLogFactory(new MavenLogFactory(this));
-
         calculateClassPath();
 
         // add resource directories to the classpath.  This is required to support
diff --git a/eclipse/org.mybatis.generator.eclipse.ui/antsrc/org/mybatis/generator/eclipse/ui/ant/logging/commons/JakartaCommonsLoggingImpl.java b/eclipse/org.mybatis.generator.eclipse.ui/antsrc/org/mybatis/generator/eclipse/ui/ant/logging/commons/JakartaCommonsLoggingImpl.java
@@ -55,4 +55,8 @@ public void warn(String s) {
         log.warn(s);
     }
 
+    @Override
+    public void info(String s) {
+        log.info(s);
+    }
 }
diff --git a/eclipse/org.mybatis.generator.eclipse.ui/antsrc/org/mybatis/generator/eclipse/ui/ant/logging/log4j2/Log4j2AbstractLoggerImpl.java b/eclipse/org.mybatis.generator.eclipse.ui/antsrc/org/mybatis/generator/eclipse/ui/ant/logging/log4j2/Log4j2AbstractLoggerImpl.java
@@ -66,4 +66,8 @@ public void warn(String s) {
         log.logIfEnabled(FQCN, Level.WARN, MARKER, (Message) new SimpleMessage(s), null);
     }
 
+    @Override
+    public void info(String s) {
+        log.logIfEnabled(FQCN, Level.INFO, MARKER, (Message) new SimpleMessage(s), null);
+    }
 }
diff --git a/eclipse/org.mybatis.generator.eclipse.ui/antsrc/org/mybatis/generator/eclipse/ui/ant/logging/log4j2/Log4j2Impl.java b/eclipse/org.mybatis.generator.eclipse.ui/antsrc/org/mybatis/generator/eclipse/ui/ant/logging/log4j2/Log4j2Impl.java
@@ -63,4 +63,8 @@ public void warn(String s) {
         log.warn(s);
     }
 
+    @Override
+    public void info(String s) {
+        log.info(s);
+    }
 }
diff --git a/eclipse/org.mybatis.generator.eclipse.ui/antsrc/org/mybatis/generator/eclipse/ui/ant/logging/log4j2/Log4j2LoggerImpl.java b/eclipse/org.mybatis.generator.eclipse.ui/antsrc/org/mybatis/generator/eclipse/ui/ant/logging/log4j2/Log4j2LoggerImpl.java
@@ -60,4 +60,8 @@ public void warn(String s) {
         log.warn(MARKER, s);
     }
 
+    @Override
+    public void info(String s) {
+        log.info(MARKER, s);
+    }
 }
diff --git a/eclipse/org.mybatis.generator.eclipse.ui/antsrc/org/mybatis/generator/eclipse/ui/ant/logging/slf4j/Slf4jImpl.java b/eclipse/org.mybatis.generator.eclipse.ui/antsrc/org/mybatis/generator/eclipse/ui/ant/logging/slf4j/Slf4jImpl.java
@@ -76,4 +76,8 @@ public void warn(String s) {
         log.warn(s);
     }
 
+    @Override
+    public void info(String s) {
+        log.info(s);
+    }
 }
diff --git a/eclipse/org.mybatis.generator.eclipse.ui/antsrc/org/mybatis/generator/eclipse/ui/ant/logging/slf4j/Slf4jLocationAwareLoggerImpl.java b/eclipse/org.mybatis.generator.eclipse.ui/antsrc/org/mybatis/generator/eclipse/ui/ant/logging/slf4j/Slf4jLocationAwareLoggerImpl.java
@@ -62,4 +62,8 @@ public void warn(String s) {
         logger.log(MARKER, FQCN, LocationAwareLogger.WARN_INT, s, null, null);
     }
 
+    @Override
+    public void info(String s) {
+        logger.log(MARKER, FQCN, LocationAwareLogger.INFO_INT, s, null, null);
+    }
 }
diff --git a/eclipse/org.mybatis.generator.eclipse.ui/antsrc/org/mybatis/generator/eclipse/ui/ant/logging/slf4j/Slf4jLoggerImpl.java b/eclipse/org.mybatis.generator.eclipse.ui/antsrc/org/mybatis/generator/eclipse/ui/ant/logging/slf4j/Slf4jLoggerImpl.java
@@ -55,4 +55,8 @@ public void warn(String s) {
         log.warn(s);
     }
 
+    @Override
+    public void info(String s) {
+        log.info(s);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2006-2022 the original author or authors.`
	`2`	`+ * Copyright 2006-2023 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -26,4 +26,6 @@ public interface Log {`
`26`	`26`	`void debug(String s);`
`27`	`27`
`28`	`28`	`void warn(String s);`
	`29`	`+`
	`30`	`+ void info(String s);`
`29`	`31`	`}`