#22 one access point

jcabi · Aug 12, 2022 · b0124fa · b0124fa
1 parent b25fc61
commit b0124fa
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 20 deletions.
diff --git a/src/main/java/com/jcabi/slf4j/JcabiLoggers.java b/src/main/java/com/jcabi/slf4j/JcabiLoggers.java
@@ -73,4 +73,12 @@ public void setMavenLog(final Log log) {
         }
     }
 
+    /**
+     * Get Maven log.
+     * @return The log
+     */
+    public Log getMavenLog() {
+        return this.mlog;
+    }
+
 }
diff --git a/src/main/java/com/jcabi/slf4j/MavenSlf4j.java b/src/main/java/com/jcabi/slf4j/MavenSlf4j.java
@@ -31,11 +31,11 @@
 
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
-import org.apache.maven.plugin.logging.Log;
 import org.slf4j.ILoggerFactory;
 import org.slf4j.IMarkerFactory;
 import org.slf4j.helpers.BasicMDCAdapter;
 import org.slf4j.helpers.BasicMarkerFactory;
+import org.slf4j.impl.StaticLoggerBinder;
 import org.slf4j.spi.MDCAdapter;
 import org.slf4j.spi.SLF4JServiceProvider;
 
@@ -57,21 +57,14 @@ public final class MavenSlf4j implements SLF4JServiceProvider {
     @SuppressWarnings("PMD.LongVariable")
     public static final String REQUESTED_API_VERSION = "2.0.99";
 
-    /**
-     * The {@link ILoggerFactory} instance returned by the
-     * {@link #getLoggerFactory()} method should always be
-     * the same object.
-     */
-    private static final JcabiLoggers LOGGERS = new JcabiLoggers();
-
     @Override
     public void initialize() {
         // nothing here
     }
 
     @Override
     public ILoggerFactory getLoggerFactory() {
-        return MavenSlf4j.LOGGERS;
+        return StaticLoggerBinder.getSingleton().getLoggerFactory();
     }
 
     @Override
@@ -89,13 +82,4 @@ public String getRequestedApiVersion() {
         return MavenSlf4j.REQUESTED_API_VERSION;
     }
 
-    /**
-     * Set Maven Log.
-     * @param log The log from Maven plugin
-     */
-    @SuppressWarnings("PMD.ProhibitPublicStaticMethods")
-    public static void setMavenLog(final Log log) {
-        MavenSlf4j.LOGGERS.setMavenLog(log);
-    }
-
 }
diff --git a/src/main/java/org/slf4j/impl/StaticLoggerBinder.java b/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
@@ -81,8 +81,10 @@ public final class StaticLoggerBinder implements LoggerFactoryBinder {
      * The {@link ILoggerFactory} instance returned by the
      * {@link #getLoggerFactory()} method should always be
      * the same object.
+     *
+     * @checkstyle VisibilityModifierCheck (5 lines)
      */
-    private final transient JcabiLoggers loggers = new JcabiLoggers();
+    public final transient JcabiLoggers loggers = new JcabiLoggers();
 
     /**
      * Private ctor to avoid direct instantiation of the class.
@@ -107,6 +109,14 @@ public void setMavenLog(final Log log) {
         this.loggers.setMavenLog(log);
     }
 
+    /**
+     * Get Maven Log.
+     * @return The log
+     */
+    public Log getMavenLog() {
+        return this.loggers.getMavenLog();
+    }
+
     @Override
     public ILoggerFactory getLoggerFactory() {
         return this.loggers;

diff --git a/src/test/java/com/jcabi/slf4j/JcabiLoggersTest.java b/src/test/java/com/jcabi/slf4j/JcabiLoggersTest.java
@@ -37,6 +37,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.slf4j.impl.StaticLoggerBinder;
 
 /**
  * Test case for {@link JcabiLoggers}.
@@ -48,7 +49,7 @@ public final class JcabiLoggersTest {
     @BeforeAll
     @SuppressWarnings("PMD.ProhibitPublicStaticMethods")
     public static void init() {
-        MavenSlf4j.setMavenLog(
+        StaticLoggerBinder.getSingleton().setMavenLog(
             new DefaultLog(
                 new ConsoleLogger(
                     Logger.LEVEL_DEBUG,