Add java.util.logging LogConsumer (#11203)

Author: dve

core/src/main/java/org/testcontainers/containers/output/BaseLogConsumer.java

@@ -0,0 +1,51 @@
+package org.testcontainers.containers.output;
+
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+
+public abstract class BaseLogConsumer<SELF extends BaseLogConsumer<SELF>> extends BaseConsumer<BaseLogConsumer<SELF>> {
+    protected boolean separateOutputStreams;
+    protected String prefix = "";
+
+    public BaseLogConsumer(boolean separateOutputStreams) {
+        this.separateOutputStreams = separateOutputStreams;
+    }
+
+    public BaseLogConsumer<SELF> withPrefix(String prefix) {
+        this.prefix = "[" + prefix + "] ";
+        return this;
+    }
+
+    public BaseLogConsumer<SELF> withSeparateOutputStreams() {
+        this.separateOutputStreams = true;
+        return this;
+    }
+
+    protected void log(Consumer<Supplier<String>> loggerError, Consumer<Supplier<String>> loggerInfo, OutputFrame outputFrame) {
+        final OutputFrame.OutputType outputType = outputFrame.getType();
+        final String utf8String = outputFrame.getUtf8StringWithoutLineEnding();
+        Supplier<String> seperateOSSupplier = () -> (prefix.isEmpty() ? "" : (prefix + ": ")) + utf8String;
+        Supplier<String> jointOSSupplier = () -> prefix + outputType + ": " + utf8String;
+        switch (outputType) {
+            case END:
+                break;
+            case STDOUT:
+                if (separateOutputStreams) {
+                    loggerInfo.accept(seperateOSSupplier);
+                } else {
+                    loggerInfo.accept(jointOSSupplier);
+                }
+                break;
+            case STDERR:
+                if (separateOutputStreams) {
+                    loggerError.accept(seperateOSSupplier);
+                } else {
+                    loggerInfo.accept(jointOSSupplier);
+                }
+                break;
+            default:
+                throw new IllegalArgumentException("Unexpected outputType " + outputType);
+        }
+
+    }
+}

core/src/main/java/org/testcontainers/containers/output/JulLogConsumer.java

@@ -0,0 +1,25 @@
+package org.testcontainers.containers.output;
+
+import java.util.logging.Logger;
+
+/**
+ * A consumer for container output that logs output to a {@link java.util.logging.Logger}.
+ */
+public class JulLogConsumer extends BaseLogConsumer<JulLogConsumer> {
+
+    private final Logger logger;
+
+    public JulLogConsumer(Logger logger) {
+        this(logger, false);
+    }
+
+    public JulLogConsumer(Logger logger, boolean separateOutputStreams) {
+        super(separateOutputStreams);
+        this.logger = logger;
+    }
+
+    @Override
+    public void accept(OutputFrame outputFrame) {
+        log(logger::severe, logger::info, outputFrame);
+    }
+}

core/src/main/java/org/testcontainers/containers/output/Slf4jLogConsumer.java

@@ -9,28 +9,19 @@
 /**
  * A consumer for container output that logs output to an SLF4J logger.
  */
-public class Slf4jLogConsumer extends BaseConsumer<Slf4jLogConsumer> {
+public class Slf4jLogConsumer extends BaseLogConsumer<Slf4jLogConsumer> {
 
     private final Logger logger;
 
     private final Map<String, String> mdc = new HashMap<>();
 
-    private boolean separateOutputStreams;
-
-    private String prefix = "";
-
     public Slf4jLogConsumer(Logger logger) {
         this(logger, false);
     }
 
     public Slf4jLogConsumer(Logger logger, boolean separateOutputStreams) {
+        super(separateOutputStreams);
         this.logger = logger;
-        this.separateOutputStreams = separateOutputStreams;
-    }
-
-    public Slf4jLogConsumer withPrefix(String prefix) {
-        this.prefix = "[" + prefix + "] ";
-        return this;
     }
 
     public Slf4jLogConsumer withMdc(String key, String value) {
@@ -43,39 +34,20 @@ public Slf4jLogConsumer withMdc(Map<String, String> mdc) {
         return this;
     }
 
-    public Slf4jLogConsumer withSeparateOutputStreams() {
-        this.separateOutputStreams = true;
-        return this;
-    }
-
     @Override
     public void accept(OutputFrame outputFrame) {
-        final OutputFrame.OutputType outputType = outputFrame.getType();
-        final String utf8String = outputFrame.getUtf8StringWithoutLineEnding();
-
         final Map<String, String> originalMdc = MDC.getCopyOfContextMap();
         MDC.setContextMap(mdc);
         try {
-            switch (outputType) {
-                case END:
-                    break;
-                case STDOUT:
-                    if (separateOutputStreams) {
-                        logger.info("{}{}", prefix.isEmpty() ? "" : (prefix + ": "), utf8String);
-                    } else {
-                        logger.info("{}{}: {}", prefix, outputType, utf8String);
-                    }
-                    break;
-                case STDERR:
-                    if (separateOutputStreams) {
-                        logger.error("{}{}", prefix.isEmpty() ? "" : (prefix + ": "), utf8String);
-                    } else {
-                        logger.info("{}{}: {}", prefix, outputType, utf8String);
-                    }
-                    break;
-                default:
-                    throw new IllegalArgumentException("Unexpected outputType " + outputType);
-            }
+            log((s) -> {
+                if (logger.isErrorEnabled()) {
+                    logger.error(s.get());
+                }
+            }, (s) -> {
+                if (logger.isInfoEnabled()) {
+                    logger.info(s.get());
+                }
+            }, outputFrame);
         } finally {
             if (originalMdc == null) {
                 MDC.clear();