Merge pull request #194 from TheSnoozer/master

Fix for #191 slf4j simple-logger for logging

Author: ktoso

pom.xml

@@ -72,6 +72,7 @@
     <maven-plugin-api.version>3.1.1</maven-plugin-api.version>
 
     <jgit.version>3.7.0.201502260915-r</jgit.version>
+    <slf4j.version>1.7.12</slf4j.version>
     <junit.version>4.12</junit.version>
     <mockito.version>2.0.5-beta</mockito.version>
 
@@ -128,6 +129,18 @@
       <version>${jgit.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
+
     <!-- Test stuff -->
     <dependency>
       <groupId>junit</groupId>

src/main/java/pl/project13/maven/git/log/MavenLoggerBridge.java

@@ -15,21 +15,39 @@
  * along with git-commit-id-plugin.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 package pl.project13.maven.git.log;
 
+import java.util.Properties;
+
 import com.google.common.base.Joiner;
+
 import org.apache.maven.plugin.logging.Log;
+import org.slf4j.Logger;
+import org.slf4j.impl.SimpleLogger;
+import org.slf4j.impl.SimpleLoggerFactory;
 
 public class MavenLoggerBridge implements LoggerBridge {
 
-  private final Log logger;
+  private Logger logger;
   private boolean verbose;
 
-  public MavenLoggerBridge(Log logger, boolean verbose) {
-    this.logger = logger;
+  public MavenLoggerBridge(Log log, boolean verbose) {
+    setSimpleLoggerPorperties();
+    this.logger = new SimpleLoggerFactory().getLogger(getClass().getName());
     this.verbose = verbose;
   }
 
+  private void setSimpleLoggerPorperties() {
+    Properties sysProperties = System.getProperties();
+    if(!sysProperties.containsKey(SimpleLogger.SHOW_THREAD_NAME_KEY)){
+      System.setProperty(SimpleLogger.SHOW_THREAD_NAME_KEY, String.valueOf(false));
+    }
+    if(!sysProperties.containsKey(SimpleLogger.LEVEL_IN_BRACKETS_KEY)){
+      System.setProperty(SimpleLogger.LEVEL_IN_BRACKETS_KEY, String.valueOf(true));
+    }
+  }
+
   @Override
   public void log(Object... parts) {
     if (verbose) {
@@ -43,7 +61,7 @@ public void error(Object... parts) {
       logger.error(Joiner.on(" ").useForNull("null").join(parts));
     }
   }
-  
+
   @Override
   public void debug(Object... parts) {
     if (verbose) {
@@ -56,4 +74,8 @@ public void setVerbose(boolean verbose) {
     this.verbose = verbose;
   }
 
+  protected void setLogger(Logger logger){
+    this.logger = logger;
+  }
+
 }

src/test/java/pl/project13/maven/git/log/MavenLoggerBridgeTest.java

@@ -1,16 +1,15 @@
 package pl.project13.maven.git.log;
 
-import org.apache.maven.plugin.logging.Log;
 import org.junit.Test;
+import org.slf4j.Logger;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
-public class MavenLoggerBridgeTest {
-
-  Log logger = mock(Log.class);
 
-  MavenLoggerBridge bridge = new MavenLoggerBridge(logger, true);
+public class MavenLoggerBridgeTest {
+  Logger logger = mock(Logger.class);
+  MavenLoggerBridge bridge = new MavenLoggerBridge(null, true);
 
   @Test
   public void shouldNotFailWhenMessageContainsPercentSigns() throws Exception {
@@ -21,6 +20,7 @@ public void shouldNotFailWhenMessageContainsPercentSigns() throws Exception {
     String expectedExplicit = "the output was: [ 100% coverage!!! ]";
 
     // when
+    bridge.setLogger(logger);
     bridge.log(start, content, end);
 
     // then