implement bridge

Author: syjer

openhtmltopdf-core/src/main/java/com/openhtmltopdf/util/Diagnostic.java

@@ -14,4 +14,28 @@ public class Diagnostic {
         this.args = args;
         this.error = hasError ? (Throwable) args[args.length - 1] : null;
     }
+
+    public LogMessageId getLogMessageId() {
+        return logMessageId;
+    }
+
+    public Level getLevel() {
+        return level;
+    }
+
+    public boolean hasError() {
+        return error != null;
+    }
+
+    public Throwable getError() {
+        return error;
+    }
+
+    public String getFormattedMessage() {
+        return String.format(logMessageId.getMessageFormat().replaceAll("\\{\\}", "%s"), args);
+    }
+
+    public Object[] getArgs() {
+        return args;
+    }
 }

openhtmltopdf-core/src/main/java/com/openhtmltopdf/util/JDKXRLogger.java

@@ -119,14 +119,14 @@ private static Properties retrieveLoggingProperties() {
     }
 
     private static void initializeJDKLogManager(final Properties fsLoggingProperties) throws IOException {
-        final List loggers = retrieveLoggers();
+        final List<Logger> loggers = retrieveLoggers();
 
         configureLoggerHandlerForwarding(fsLoggingProperties, loggers);
 
         // load our properties into our log manager
         Enumeration keys = fsLoggingProperties.keys();
-        Map handlers = new HashMap();
-        Map handlerFormatterMap = new HashMap();
+        Map<String, Logger> handlers = new HashMap<>();
+        Map<String, String> handlerFormatterMap = new HashMap<>();
         while (keys.hasMoreElements()) {
             String key = (String) keys.nextElement();
             String prop = fsLoggingProperties.getProperty(key);
@@ -149,14 +149,10 @@ private static void initializeJDKLogManager(final Properties fsLoggingProperties
         }
     }
 
-    private static void configureLoggerHandlerForwarding(Properties fsLoggingProperties, List loggers) {
+    private static void configureLoggerHandlerForwarding(Properties fsLoggingProperties, List<Logger> loggers) {
         String val = fsLoggingProperties.getProperty("use-parent-handler");
-
         boolean flag = val == null ? false : Boolean.valueOf(val).booleanValue();
-        for (Iterator it = loggers.iterator(); it.hasNext();) {
-            Logger logger = (Logger) it.next();
-            logger.setUseParentHandlers(flag);
-        }
+        loggers.forEach(l -> l.setUseParentHandlers(flag));
     }
 
     private static void assignFormatter(Map handlers, String handlerClassName, String formatterClassName) {
@@ -183,12 +179,12 @@ private static void assignFormatter(Map handlers, String handlerClassName, Strin
      * Returns a List of all Logger instances used by Flying Saucer from the JDK LogManager; these will
      * be automatically created if they aren't already available.
      */
-    private static List retrieveLoggers() {
-        List loggerNames = XRLog.listRegisteredLoggers();
-        List loggers = new ArrayList(loggerNames.size());
-        Iterator it = loggerNames.iterator();
+    private static List<Logger> retrieveLoggers() {
+        List<String> loggerNames = XRLog.listRegisteredLoggers();
+        List<Logger> loggers = new ArrayList<>(loggerNames.size());
+        Iterator<String> it = loggerNames.iterator();
         while (it.hasNext()) {
-            final String ln = (String) it.next();
+            final String ln = it.next();
             loggers.add(Logger.getLogger(ln));
         }
         return loggers;

openhtmltopdf-core/src/main/java/com/openhtmltopdf/util/ThreadCtx.java

@@ -22,7 +22,7 @@ public static ThreadData get() {
 		return data.get();
 	}
 
-	public static void addDiagnostic(Diagnostic diagnostic) {
+	static void addDiagnostic(Diagnostic diagnostic) {
 		Consumer<Diagnostic> consumer = diagnosticConsumer.get();
 		if (consumer != null) {
 			consumer.accept(diagnostic);

openhtmltopdf-core/src/main/java/com/openhtmltopdf/util/XRLog.java

@@ -99,7 +99,7 @@ private static void log(Level level, LogMessageId logMessageId, boolean hasError
         }
         if (isLoggingEnabled()) {
             Diagnostic diagnostic = new Diagnostic(level, logMessageId, hasError, args);
-            //loggerImpl.log(where, level, msg); FIXME: how to bridge with the logger in a retrocompatible way?
+            loggerImpl.log(diagnostic);
             ThreadCtx.addDiagnostic(diagnostic);
         }
     }

openhtmltopdf-core/src/main/java/com/openhtmltopdf/util/XRLogger.java

@@ -28,4 +28,19 @@ public interface XRLogger {
     void log(String where, Level level, String msg);
     void log(String where, Level level, String msg, Throwable th);
     void setLevel(String logger, Level level);
+
+    /**
+     * Default slow (!) implementation for logging a Diagnostic object.
+     *
+     * Concrete implementation must/should override it.
+     *
+     * @param diagnostic
+     */
+    default void log(Diagnostic diagnostic) {
+        if (diagnostic.hasError()) {
+            log(diagnostic.getLogMessageId().getWhere(), diagnostic.getLevel(), diagnostic.getFormattedMessage(), diagnostic.getError());
+        } else {
+            log(diagnostic.getLogMessageId().getWhere(), diagnostic.getLevel(), diagnostic.getFormattedMessage());
+        }
+    }
 }

openhtmltopdf-slf4j/src/main/java/com/openhtmltopdf/slf4j/Slf4jLogger.java

@@ -23,6 +23,7 @@
 import java.util.Map;
 import java.util.logging.Level;
 
+import com.openhtmltopdf.util.Diagnostic;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -52,7 +53,25 @@ public class Slf4jLogger implements XRLogger {
 
     private String _defaultLoggerName = DEFAULT_LOGGER_NAME;
     private Map<String, String> _loggerNameMap = LOGGER_NAME_MAP;
-    
+
+    @Override
+    public void log(Diagnostic diagnostic) {
+        Logger logger = LoggerFactory.getLogger(getLoggerName(diagnostic.getLogMessageId().getWhere()));
+        Level level = diagnostic.getLevel();
+        String msg = diagnostic.getLogMessageId().getMessageFormat();
+        Object[] args = diagnostic.getArgs();
+        if (level == Level.SEVERE)
+            logger.error(msg, args);
+        else if (level == Level.WARNING)
+            logger.warn(msg, args);
+        else if (level == Level.INFO || level == Level.CONFIG)
+            logger.info(msg, args);
+        else if (level == Level.FINE || level == Level.FINER || level == Level.FINEST)
+            logger.debug(msg, args);
+        else
+            logger.info(msg, args);
+    }
+
     @Override
     public void log(String where, Level level, String msg) {
     	Logger logger = LoggerFactory.getLogger(getLoggerName(where));