Improved MqttIncomingQosHandler

Author: SgtSilvio

src/main/java/com/hivemq/client/internal/logging/InternalLogger.java

@@ -27,7 +27,13 @@ public interface InternalLogger {
 
     void error(@NotNull String message, @NotNull Throwable throwable);
 
+    void error(@NotNull String format, @NotNull Object arg);
+
+    void error(@NotNull String format, @NotNull Object arg1, @NotNull Object arg2);
+
     void warn(@NotNull String message);
 
-    void warn(@NotNull String format, @NotNull Object... args);
+    void warn(@NotNull String format, @NotNull Object arg);
+
+    void warn(@NotNull String format, @NotNull Object arg1, @NotNull Object arg2);
 }

src/main/java/com/hivemq/client/internal/logging/InternalLoggerFactory.java

@@ -34,7 +34,7 @@ public final class InternalLoggerFactory {
         if (SLF4J_AVAILABLE) {
             return new InternalSlf4jLogger(clazz);
         }
-        return new InternalNoopLogger(clazz);
+        return InternalNoopLogger.INSTANCE;
     }
 
     private InternalLoggerFactory() {}

src/main/java/com/hivemq/client/internal/logging/InternalNoopLogger.java

@@ -23,17 +23,28 @@
  */
 class InternalNoopLogger implements InternalLogger {
 
-    InternalNoopLogger(@SuppressWarnings("unused") final @NotNull Class<?> clazz) {}
+    static final @NotNull InternalLogger INSTANCE = new InternalNoopLogger();
+
+    private InternalNoopLogger() {}
 
     @Override
     public void error(final @NotNull String message) {}
 
     @Override
     public void error(final @NotNull String message, final @NotNull Throwable throwable) {}
 
+    @Override
+    public void error(final @NotNull String format, final @NotNull Object arg) {}
+
+    @Override
+    public void error(final @NotNull String format, final @NotNull Object arg1, final @NotNull Object arg2) {}
+
     @Override
     public void warn(final @NotNull String message) {}
 
     @Override
-    public void warn(final @NotNull String format, final @NotNull Object... args) {}
+    public void warn(final @NotNull String format, final @NotNull Object arg) {}
+
+    @Override
+    public void warn(final @NotNull String format, final @NotNull Object arg1, final @NotNull Object arg2) {}
 }

src/main/java/com/hivemq/client/internal/logging/InternalSlf4jLogger.java

@@ -41,13 +41,28 @@ public void error(final @NotNull String message, final @NotNull Throwable throwa
         delegate.error(message, throwable);
     }
 
+    @Override
+    public void error(final @NotNull String format, final @NotNull Object arg) {
+        delegate.error(format, arg);
+    }
+
+    @Override
+    public void error(final @NotNull String format, final @NotNull Object arg1, final @NotNull Object arg2) {
+        delegate.error(format, arg1, arg2);
+    }
+
     @Override
     public void warn(final @NotNull String message) {
         delegate.warn(message);
     }
 
     @Override
-    public void warn(final @NotNull String format, final @NotNull Object... args) {
-        delegate.warn(format, args);
+    public void warn(final @NotNull String format, final @NotNull Object arg) {
+        delegate.warn(format, arg);
+    }
+
+    @Override
+    public void warn(final @NotNull String format, final @NotNull Object arg1, final @NotNull Object arg2) {
+        delegate.warn(format, arg1, arg2);
     }
 }