refactroing logger sl4j module

Author: JavaSaBr

rlib-logger-api/src/main/java/javasabr/rlib/logger/api/LoggerFactory.java

@@ -4,54 +4,17 @@
 
 public interface LoggerFactory {
 
-  /**
-   * Make a new logger with the name.
-   *
-   * @param name the logger's name.
-   * @return the new logger.
-   */
   Logger make(String name);
 
-  /**
-   * Make a new logger for the type.
-   *
-   * @param type the logger's type.
-   * @return the new logger.
-   */
   Logger make(Class<?> type);
 
-  /**
-   * Get a default logger.
-   *
-   * @return he default logger.
-   */
   Logger getDefault();
 
-  /**
-   * Add the new listener.
-   *
-   * @param listener the new listener.
-   */
   void addListener(LoggerListener listener);
 
-  /**
-   * Add the new writer.
-   *
-   * @param writer the new writer.
-   */
-  void addWriter(Writer writer);
-
-  /**
-   * Remove the listener.
-   *
-   * @param listener the listener.
-   */
   void removeListener(LoggerListener listener);
 
-  /**
-   * Remove the writer.
-   *
-   * @param writer the writer.
-   */
+  void addWriter(Writer writer);
+
   void removeWriter(Writer writer);
 }

rlib-logger-api/src/main/java/javasabr/rlib/logger/api/LoggerListener.java

@@ -1,22 +1,11 @@
 package javasabr.rlib.logger.api;
 
 /**
- * The interface to implement a listener of logger events.
- *
  * @author JavaSaBr
  */
 public interface LoggerListener {
 
-  /**
-   * Print the result logger message.
-   *
-   * @param text the text.
-   */
   void println(String text);
 
-  /**
-   * Flush last data.
-   */
-  default void flush() {
-  }
+  default void flush() {}
 }

rlib-logger-api/src/main/java/javasabr/rlib/logger/api/LoggerManager.java

@@ -2,12 +2,11 @@
 
 import java.io.Writer;
 import java.lang.reflect.InvocationTargetException;
+import java.util.Iterator;
 import java.util.ServiceLoader;
 import javasabr.rlib.logger.api.impl.NullLoggerFactory;
 
 /**
- * The class to manage loggers.
- *
  * @author JavaSaBr
  */
 public class LoggerManager {
@@ -17,32 +16,27 @@ public class LoggerManager {
   static {
 
     String className = System.getProperty("com.ss.rlib.logger.factory", "");
-
     Class<? extends LoggerFactory> implementation = null;
 
     if (!className.isEmpty()) {
       try {
         implementation = (Class<? extends LoggerFactory>) Class.forName(className);
-      } catch (ClassNotFoundException e) {
-        e.printStackTrace();
+      } catch (ClassNotFoundException exception) {
+        exception.printStackTrace();
       }
     }
 
     if (implementation == null) {
-
-      var impls = ServiceLoader
+      Iterator<LoggerFactory> impls = ServiceLoader
           .load(LoggerFactory.class)
           .iterator();
-
       if (impls.hasNext()) {
-        implementation = impls
-            .next()
-            .getClass();
+        implementation = impls.next().getClass();
       }
     }
 
     if (implementation == null) {
-      System.err.println("ERROR: No any exist implementation of Rlib Logger Factory, will use null logger");
+      System.err.printf("ERROR: No any exist implementation of [%s], will be used null logger%n", LoggerFactory.class);
       LOGGER_FACTORY = new NullLoggerFactory();
     } else {
       try {
@@ -55,87 +49,38 @@ public class LoggerManager {
     }
   }
 
-  /**
-   * Add the new listener.
-   *
-   * @param listener the new listener.
-   */
-  public static void addListener(LoggerListener listener) {
-    LOGGER_FACTORY.addListener(listener);
-  }
-
-  /**
-   * Add the new writer.
-   *
-   * @param writer the new writer.
-   */
-  public static void addWriter(Writer writer) {
-    LOGGER_FACTORY.addWriter(writer);
-  }
-
-  /**
-   * Get the main logger.
-   *
-   * @return the main logger.
-   */
   public static Logger getDefaultLogger() {
     return LOGGER_FACTORY.getDefault();
   }
 
-  /**
-   * Get or create a logger for the class.
-   *
-   * @param cs the class.
-   * @return the logger for the class.
-   */
   public static Logger getLogger(Class<?> cs) {
     return LOGGER_FACTORY.make(cs);
   }
 
-  /**
-   * Get or create a logger for the id.
-   *
-   * @param id the id.
-   * @return the logger for the class.
-   */
   public static Logger getLogger(String id) {
     return LOGGER_FACTORY.make(id);
   }
 
-  /**
-   * Remove the listener.
-   *
-   * @param listener the listener.
-   */
+  public static void addListener(LoggerListener listener) {
+    LOGGER_FACTORY.addListener(listener);
+  }
+
   public static void removeListener(LoggerListener listener) {
     LOGGER_FACTORY.removeListener(listener);
   }
 
-  /**
-   * Remove the writer.
-   *
-   * @param writer the writer.
-   */
+  public static void addWriter(Writer writer) {
+    LOGGER_FACTORY.addWriter(writer);
+  }
+
   public static void removeWriter(Writer writer) {
     LOGGER_FACTORY.removeWriter(writer);
   }
 
-  /**
-   * Enable passed logger level for some logger.
-   *
-   * @param cs the class which use its own logger.
-   * @param level the logger level to enable.
-   */
   public static void enable(Class<?> cs, LoggerLevel level) {
     getLogger(cs).overrideEnabled(level, true);
   }
 
-  /**
-   * Disable passed logger level for some logger.
-   *
-   * @param cs the class which use its own logger.
-   * @param level the logger level to disable.
-   */
   public static void disable(Class<?> cs, LoggerLevel level) {
     getLogger(cs).overrideEnabled(level, false);
   }

rlib-logger-api/src/main/java/javasabr/rlib/logger/api/impl/NullLogger.java

@@ -2,9 +2,7 @@
 
 import javasabr.rlib.logger.api.Logger;
 import javasabr.rlib.logger.api.LoggerLevel;
-import org.jspecify.annotations.NullMarked;
 
-@NullMarked
 public final class NullLogger implements Logger {
 
   @Override

rlib-logger-api/src/main/java/javasabr/rlib/logger/api/impl/NullLoggerFactory.java

@@ -4,9 +4,7 @@
 import javasabr.rlib.logger.api.Logger;
 import javasabr.rlib.logger.api.LoggerFactory;
 import javasabr.rlib.logger.api.LoggerListener;
-import org.jspecify.annotations.NullMarked;
 
-@NullMarked
 public class NullLoggerFactory implements LoggerFactory {
 
   private static final NullLogger NULL_LOGGER = new NullLogger();

rlib-logger-api/src/main/java/javasabr/rlib/logger/api/impl/package-info.java

@@ -0,0 +1,4 @@
+@NullMarked
+package javasabr.rlib.logger.api.impl;
+
+import org.jspecify.annotations.NullMarked;

rlib-logger-slf4j/src/main/java/javasabr/rlib/logger/slf4j/Slf4jLogger.java

@@ -11,54 +11,31 @@ public class Slf4jLogger implements Logger {
 
   @Override
   public boolean enabled(LoggerLevel level) {
-
-    switch (level) {
-      case INFO:
-        return logger.isInfoEnabled();
-      case DEBUG:
-        return logger.isDebugEnabled();
-      case ERROR:
-        return logger.isErrorEnabled();
-      case WARNING:
-        return logger.isWarnEnabled();
-    }
-
-    return false;
+    return switch (level) {
+      case INFO -> logger.isInfoEnabled();
+      case DEBUG -> logger.isDebugEnabled();
+      case ERROR -> logger.isErrorEnabled();
+      case WARNING -> logger.isWarnEnabled();
+    };
   }
 
   @Override
   public void print(LoggerLevel level, String message) {
-
     switch (level) {
-      case INFO:
-        logger.info(message);
-        return;
-      case DEBUG:
-        logger.debug(message);
-        return;
-      case ERROR:
-        logger.error(message);
-        return;
-      case WARNING:
-        logger.warn(message);
+      case INFO -> logger.info(message);
+      case DEBUG -> logger.debug(message);
+      case ERROR -> logger.error(message);
+      case WARNING -> logger.warn(message);
     }
   }
 
   @Override
   public void print(LoggerLevel level, Throwable exception) {
-
     switch (level) {
-      case INFO:
-        logger.info(exception.getMessage(), exception);
-        return;
-      case DEBUG:
-        logger.debug(exception.getMessage(), exception);
-        return;
-      case ERROR:
-        logger.error(exception.getMessage(), exception);
-        return;
-      case WARNING:
-        logger.warn(exception.getMessage(), exception);
+      case INFO -> logger.info(exception.getMessage(), exception);
+      case DEBUG -> logger.debug(exception.getMessage(), exception);
+      case ERROR -> logger.error(exception.getMessage(), exception);
+      case WARNING -> logger.warn(exception.getMessage(), exception);
     }
   }
 }