Use abstract methods for each level instead of just loggerFor()

Author: Jonathing

log-utils/src/main/java/net/minecraftforge/util/logging/AbstractLogger.java

@@ -1,9 +1,11 @@
+/*
+ * Copyright (c) Forge Development LLC
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
 package net.minecraftforge.util.logging;
 
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 
-import java.io.PrintStream;
 import java.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -138,265 +140,9 @@ public final void release(BiConsumer<Level, String> consumer) {
 
     /* LOGGING */
 
-    private static final DelegatePrintStream.Empty EMPTY = DelegatePrintStream.EMPTY;
-    private final DelegatePrintStream.Capturing debug = new DelegatePrintStream.Capturing(this, Level.DEBUG, this.loggerFor(Level.DEBUG));
-    private final DelegatePrintStream.Capturing quiet = new DelegatePrintStream.Capturing(this, Level.QUIET, this.loggerFor(Level.QUIET));
-    private final DelegatePrintStream.Capturing info = new DelegatePrintStream.Capturing(this, Level.INFO, this.loggerFor(Level.INFO));
-    private final DelegatePrintStream.Capturing warn = new DelegatePrintStream.Capturing(this, Level.WARN, this.loggerFor(Level.WARN));
-    private final DelegatePrintStream.Capturing error = new DelegatePrintStream.Capturing(this, Level.ERROR, this.loggerFor(Level.ERROR));
-    private final DelegatePrintStream.Capturing fatal = new DelegatePrintStream.Capturing(this, Level.FATAL, this.loggerFor(Level.FATAL));
-
-    /**
-     * Creates a logger for the given level.
-     * <p>The result of this method is saved in this logger when it is created.</p>
-     *
-     * @param level The level to create a logger for
-     * @return The logger
-     */
-    protected abstract Consumer<? super String> loggerFor(Level level);
-
-    @Override
-    public final PrintStream getLog(@Nullable Level level) {
-        if (level == null) return EMPTY;
-        switch (level) {
-            case DEBUG: return this.debug;
-            case QUIET: return this.quiet;
-            case INFO: return this.info;
-            case WARN: return this.warn;
-            case ERROR: return this.error;
-            case FATAL: return this.fatal;
-        }
-
-        throw new IllegalStateException("Unexpected value: " + level);
-    }
-
-    @Override
-    public final void log(Level level) {
-        getLog(level).println();
-    }
-
-    @Override
-    public final void log(Level level, String message) {
-        getLog(level).println(message);
-    }
+    static final DelegatePrintStream.Empty EMPTY = DelegatePrintStream.EMPTY;
 
     private void logDirectly(Level level, String message) {
         ((DelegatePrintStream) this.getLog(level)).getDelegate().accept(message);
     }
-
-    @Override
-    public final void log(Level level, Object message) {
-        getLog(level).println(message);
-    }
-
-    @Override
-    public final void log(Level level, Throwable throwable) {
-        throwable.printStackTrace(getLog(level));
-    }
-
-    @Override
-    public final void log(Level level, Object message, Throwable throwable) {
-        PrintStream log = getLog(level);
-        log.println(message);
-        throwable.printStackTrace(log);
-    }
-
-    @Override
-    public final void log(Level level, String message, Throwable throwable) {
-        PrintStream log = getLog(level);
-        log.println(message);
-        throwable.printStackTrace(log);
-    }
-
-    @Override
-    public final void debug() {
-        this.debug.println();
-    }
-
-    @Override
-    public final void debug(String message) {
-        this.debug.println(message);
-    }
-
-    @Override
-    public final void debug(Object message) {
-        this.debug.println(message);
-    }
-
-    @Override
-    public final void debug(Throwable throwable) {
-        throwable.printStackTrace(this.debug);
-    }
-
-    @Override
-    public final void debug(String message, Throwable throwable) {
-        debug(message);
-        debug(throwable);
-    }
-
-    @Override
-    public final void debug(Object message, Throwable throwable) {
-        debug(message);
-        debug(throwable);
-    }
-
-    @Override
-    public final void quiet() {
-        this.quiet.println();
-    }
-
-    @Override
-    public final void quiet(String message) {
-        this.quiet.println(message);
-    }
-
-    @Override
-    public final void quiet(Object message) {
-        this.quiet.println(message);
-    }
-
-    @Override
-    public final void quiet(Throwable throwable) {
-        throwable.printStackTrace(this.quiet);
-    }
-
-    @Override
-    public final void quiet(String message, Throwable throwable) {
-        quiet(message);
-        quiet(throwable);
-    }
-
-    @Override
-    public final void quiet(Object message, Throwable throwable) {
-        quiet(message);
-        quiet(throwable);
-    }
-
-    @Override
-    public final void info() {
-        this.info.println();
-    }
-
-    @Override
-    public final void info(String message) {
-        this.info.println(message);
-    }
-
-    @Override
-    public final void info(Object message) {
-        this.info.println(message);
-    }
-
-    @Override
-    public final void info(Throwable throwable) {
-        throwable.printStackTrace(this.info);
-    }
-
-    @Override
-    public final void info(String message, Throwable throwable) {
-        info(message);
-        info(throwable);
-    }
-
-    @Override
-    public final void info(Object message, Throwable throwable) {
-        info(message);
-        info(throwable);
-    }
-
-    @Override
-    public final void warn() {
-        this.warn.println();
-    }
-
-    @Override
-    public final void warn(String message) {
-        this.warn.println(message);
-    }
-
-    @Override
-    public final void warn(Object message) {
-        this.warn.println(message);
-    }
-
-    @Override
-    public final void warn(Throwable throwable) {
-        throwable.printStackTrace(this.warn);
-    }
-
-    @Override
-    public final void warn(String message, Throwable throwable) {
-        warn(message);
-        warn(throwable);
-    }
-
-    @Override
-    public final void warn(Object message, Throwable throwable) {
-        warn(message);
-        warn(throwable);
-    }
-
-    @Override
-    public final void error() {
-        this.error.println();
-    }
-
-    @Override
-    public final void error(String message) {
-        this.error.println(message);
-    }
-
-    @Override
-    public final void error(Object message) {
-        this.error.println(message);
-    }
-
-    @Override
-    public final void error(Throwable throwable) {
-        throwable.printStackTrace(this.error);
-    }
-
-    @Override
-    public final void error(String message, Throwable throwable) {
-        error(message);
-        error(throwable);
-    }
-
-    @Override
-    public final void error(Object message, Throwable throwable) {
-        error(message);
-        error(throwable);
-    }
-
-    @Override
-    public final void fatal() {
-        this.fatal.println();
-    }
-
-    @Override
-    public final void fatal(String message) {
-        this.fatal.println(message);
-    }
-
-    @Override
-    public final void fatal(Object message) {
-        this.fatal.println(message);
-    }
-
-    @Override
-    public final void fatal(Throwable throwable) {
-        throwable.printStackTrace(this.fatal);
-    }
-
-    @Override
-    public final void fatal(String message, Throwable throwable) {
-        fatal(message);
-        fatal(throwable);
-    }
-
-    @Override
-    public final void fatal(Object message, Throwable throwable) {
-        fatal(message);
-        fatal(throwable);
-    }
 }

log-utils/src/main/java/net/minecraftforge/util/logging/DefaultLogger.java

@@ -1,6 +1,10 @@
+/*
+ * Copyright (c) Forge Development LLC
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
 package net.minecraftforge.util.logging;
 
-import java.util.function.Consumer;
+import java.io.PrintStream;
 
 final class DefaultLogger extends AbstractLogger {
     DefaultLogger() {
@@ -19,19 +23,40 @@ final class DefaultLogger extends AbstractLogger {
         super(enabled, indentLevel);
     }
 
+    private final DelegatePrintStream.Capturing debug = new DelegatePrintStream.Capturing(this, Level.DEBUG, System.out::println);
+    private final DelegatePrintStream.Capturing quiet = new DelegatePrintStream.Capturing(this, Level.QUIET, System.out::println);
+    private final DelegatePrintStream.Capturing info = new DelegatePrintStream.Capturing(this, Level.INFO, System.out::println);
+    private final DelegatePrintStream.Capturing warn = new DelegatePrintStream.Capturing(this, Level.WARN, System.out::println);
+    private final DelegatePrintStream.Capturing error = new DelegatePrintStream.Capturing(this, Level.ERROR, System.err::println);
+    private final DelegatePrintStream.Capturing fatal = new DelegatePrintStream.Capturing(this, Level.FATAL, System.err::println);
+
+    @Override
+    public PrintStream getDebug() {
+        return this.debug;
+    }
+
+    @Override
+    public PrintStream getQuiet() {
+        return this.quiet;
+    }
+
+    @Override
+    public PrintStream getInfo() {
+        return this.info;
+    }
+
+    @Override
+    public PrintStream getWarn() {
+        return this.warn;
+    }
+
+    @Override
+    public PrintStream getError() {
+        return this.error;
+    }
+
     @Override
-    protected Consumer<? super String> loggerFor(Level level) {
-        switch (level) {
-            case DEBUG:
-            case QUIET:
-            case INFO:
-                return System.out::println;
-            case WARN:
-            case ERROR:
-            case FATAL:
-                return System.err::println;
-        }
-
-        throw new IllegalStateException("Unexpected value: " + level);
+    public PrintStream getFatal() {
+        return this.fatal;
     }
 }