Structured properties API enhancement proposal

log4j-1.2-api/src/main/java/org/apache/log4j/PropertyConfigurator.java

@@ -49,6 +49,8 @@
 import org.apache.log4j.spi.ThrowableRendererSupport;
 import org.apache.logging.log4j.core.config.Configuration;
 import org.apache.logging.log4j.core.net.UrlConnectionFactory;
+import org.apache.logging.log4j.plugins.di.DI;
+import org.apache.logging.log4j.plugins.di.Injector;
 import org.apache.logging.log4j.util.StackLocatorUtil;
 
 /**
@@ -383,7 +385,10 @@ public void doConfigure(final URL url, final LoggerRepository loggerRepository)
     Configuration doConfigure(final URL url, final LoggerRepository loggerRepository, final ClassLoader classLoader) {
         LogLog.debug("Reading configuration from URL " + url);
         try {
-            final URLConnection urlConnection = UrlConnectionFactory.createConnection(url);
+            // TODO: find better place to anchor Injector creation
+            final Injector injector = DI.createInjector();
+            injector.init();
+            final URLConnection urlConnection = injector.getInstance(UrlConnectionFactory.class).openConnection(url);
             try (InputStream inputStream = urlConnection.getInputStream()) {
                 return doConfigure(inputStream, loggerRepository, classLoader);
             }

log4j-1.2-api/src/main/java/org/apache/log4j/bridge/AppenderAdapter.java

@@ -16,8 +16,6 @@
  */
 package org.apache.log4j.bridge;
 
-import java.io.Serializable;
-
 import org.apache.log4j.Appender;
 import org.apache.logging.log4j.core.Filter;
 import org.apache.logging.log4j.core.Layout;
@@ -76,7 +74,7 @@ public Adapter getAdapter() {
 
     public class Adapter extends AbstractAppender {
 
-        protected Adapter(final String name, final Filter filter, final Layout<? extends Serializable> layout,
+        protected Adapter(final String name, final Filter filter, final Layout<?> layout,
             final boolean ignoreExceptions, final Property[] properties) {
             super(name, filter, layout, ignoreExceptions, properties);
         }

log4j-1.2-api/src/main/java/org/apache/log4j/bridge/LogEventWrapper.java

@@ -29,7 +29,7 @@
 import org.apache.logging.log4j.Marker;
 import org.apache.logging.log4j.ThreadContext;
 import org.apache.logging.log4j.core.LogEvent;
-import org.apache.logging.log4j.core.impl.ThrowableProxy;
+import org.apache.logging.log4j.core.ThrowableProxy;
 import org.apache.logging.log4j.core.time.Instant;
 import org.apache.logging.log4j.core.time.MutableInstant;
 import org.apache.logging.log4j.message.Message;

log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/DailyRollingFileAppenderBuilder.java

@@ -16,6 +16,11 @@
  */
 package org.apache.log4j.builders.appender;
 
+import java.util.Properties;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+
 import org.apache.log4j.Appender;
 import org.apache.log4j.Layout;
 import org.apache.log4j.bridge.AppenderWrapper;
@@ -38,11 +43,6 @@
 import org.apache.logging.log4j.status.StatusLogger;
 import org.w3c.dom.Element;
 
-import java.util.Properties;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
-
 import static org.apache.log4j.builders.BuilderManager.NAMESPACE;
 import static org.apache.log4j.config.Log4j1Configuration.THRESHOLD_PARAM;
 import static org.apache.log4j.xml.XmlConfiguration.*;
@@ -115,7 +115,7 @@ public Appender parseAppender(final Element appenderElement, final XmlConfigurat
         });
         return createAppender(name, layout.get(), filter.get(), fileName.get(), append.get(), immediateFlush.get(),
                 level.get(), bufferedIo.get(), bufferSize.get(), datePattern.get(), config,
-                config.getComponent(Clock.KEY));
+                config.getInstance(Clock.class));
     }
 
     @Override
@@ -131,7 +131,7 @@ public Appender parseAppender(final String name, final String appenderPrefix, fi
         final int bufferSize = getIntegerProperty(BUFFER_SIZE_PARAM, 8192);
         final String datePattern = getProperty(DATE_PATTERN_PARAM, DEFAULT_DATE_PATTERN);
         return createAppender(name, layout, filter, fileName, append, immediateFlush, level, bufferedIo, bufferSize,
-                datePattern, configuration, configuration.getComponent(Clock.KEY));
+                datePattern, configuration, configuration.getInstance(Clock.class));
     }
 
     private <T extends Log4j1Configuration> Appender createAppender(final String name, final Layout layout,

log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/RollingFileAppenderBuilder.java

@@ -16,6 +16,11 @@
  */
 package org.apache.log4j.builders.appender;
 
+import java.util.Properties;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+
 import org.apache.log4j.Appender;
 import org.apache.log4j.Layout;
 import org.apache.log4j.bridge.AppenderWrapper;
@@ -39,11 +44,6 @@
 import org.apache.logging.log4j.status.StatusLogger;
 import org.w3c.dom.Element;
 
-import java.util.Properties;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
-
 import static org.apache.log4j.builders.BuilderManager.NAMESPACE;
 import static org.apache.log4j.config.Log4j1Configuration.THRESHOLD_PARAM;
 import static org.apache.log4j.xml.XmlConfiguration.*;
@@ -120,7 +120,7 @@ public Appender parseAppender(final Element appenderElement, final XmlConfigurat
         });
         return createAppender(name, config, layout.get(), filter.get(), append.get(), bufferedIo.get(),
                 bufferSize.get(), immediateFlush.get(), fileName.get(), level.get(), maxSize.get(), maxBackups.get(),
-                config.getComponent(Clock.KEY));
+                config.getInstance(Clock.class));
     }
 
     @Override
@@ -137,7 +137,7 @@ public Appender parseAppender(final String name, final String appenderPrefix, fi
         final String maxSize = getProperty(MAX_SIZE_PARAM, DEFAULT_MAX_SIZE);
         final String maxBackups = getProperty(MAX_BACKUP_INDEX, DEFAULT_MAX_BACKUPS);
         return createAppender(name, configuration, layout, filter, append, bufferedIo, bufferSize, immediateFlush,
-                fileName, level, maxSize, maxBackups, configuration.getComponent(Clock.KEY));
+                fileName, level, maxSize, maxBackups, configuration.getInstance(Clock.class));
     }
 
     private Appender createAppender(final String name, final Log4j1Configuration config, final Layout layout,

log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/SyslogAppenderBuilder.java

@@ -16,6 +16,11 @@
  */
 package org.apache.log4j.builders.appender;
 
+import java.util.Properties;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+
 import org.apache.log4j.Appender;
 import org.apache.log4j.Layout;
 import org.apache.log4j.bridge.AppenderWrapper;
@@ -36,12 +41,6 @@
 import org.apache.logging.log4j.util.Strings;
 import org.w3c.dom.Element;
 
-import java.io.Serializable;
-import java.util.Properties;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
-
 import static org.apache.log4j.builders.BuilderManager.NAMESPACE;
 import static org.apache.log4j.config.Log4j1Configuration.THRESHOLD_PARAM;
 import static org.apache.log4j.xml.XmlConfiguration.*;
@@ -141,7 +140,7 @@ private Appender createAppender(final String name, final Log4j1Configuration con
         final AtomicReference<String> host = new AtomicReference<>();
         final AtomicInteger port = new AtomicInteger();
         resolveSyslogHost(syslogHost, host, port);
-        final org.apache.logging.log4j.core.Layout<? extends Serializable> messageLayout = LayoutAdapter.adapt(layout);
+        final org.apache.logging.log4j.core.Layout<?> messageLayout = LayoutAdapter.adapt(layout);
         final Log4j1SyslogLayout appenderLayout = Log4j1SyslogLayout.newBuilder()
                 .setHeader(header)
                 .setFacility(Facility.toFacility(facility))

log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1Configuration.java

@@ -29,7 +29,7 @@
  */
 public class Log4j1Configuration extends AbstractConfiguration implements Reconfigurable {
 
-    public static final String MONITOR_INTERVAL = "log4j1.monitorInterval";
+    public static final String MONITOR_INTERVAL = "log4j2.*.V1Compatibility.monitorInterval";
     public static final String APPENDER_REF_TAG = "appender-ref";
     public static final String THRESHOLD_PARAM = "Threshold";
 

log4j-1.2-api/src/main/java/org/apache/log4j/config/PropertiesConfiguration.java

@@ -368,7 +368,12 @@ private void parseLoggers(final Properties props) {
                 LoggerConfig loggerConfig = getLogger(loggerName);
                 if (loggerConfig == null) {
                     final boolean additivity = getAdditivityForLogger(props, loggerName);
-                    loggerConfig = new LoggerConfig(loggerName, org.apache.logging.log4j.Level.ERROR, additivity);
+                    loggerConfig = LoggerConfig.newBuilder()
+                            .setLoggerName(loggerName)
+                            .setLevel(org.apache.logging.log4j.Level.ERROR)
+                            .setAdditivity(additivity)
+                            .setConfig(this)
+                            .get();
                     addLogger(loggerName, loggerConfig);
                 }
                 parseLogger(props, loggerConfig, key, loggerName, value);

log4j-1.2-api/src/main/java/org/apache/log4j/config/PropertiesConfigurationFactory.java

@@ -23,7 +23,7 @@
 import org.apache.logging.log4j.core.config.Order;
 import org.apache.logging.log4j.plugins.Namespace;
 import org.apache.logging.log4j.plugins.Plugin;
-import org.apache.logging.log4j.util.PropertiesUtil;
+import org.apache.logging.log4j.util.PropertyResolver;
 
 /**
  * Configures Log4j from a log4j 1 format properties file.
@@ -47,15 +47,16 @@ public class PropertiesConfigurationFactory extends ConfigurationFactory {
 
     @Override
     protected String[] getSupportedTypes() {
-        if (!PropertiesUtil.getProperties().getBooleanProperty(ConfigurationFactory.LOG4J1_EXPERIMENTAL, Boolean.FALSE)) {
+        if (!propertyResolver.getBoolean(ConfigurationFactory.LOG4J1_EXPERIMENTAL)) {
             return null;
         }
         return new String[] { FILE_EXTENSION };
     }
 
     @Override
     public Configuration getConfiguration(LoggerContext loggerContext, ConfigurationSource source) {
-        int interval = PropertiesUtil.getProperties().getIntegerProperty(Log4j1Configuration.MONITOR_INTERVAL, 0);
+        final PropertyResolver propertyResolver = loggerContext != null ? loggerContext.getPropertyResolver() : this.propertyResolver;
+        int interval = propertyResolver.getInt(Log4j1Configuration.MONITOR_INTERVAL).orElse(0);
         return new PropertiesConfiguration(loggerContext, source, interval);
     }
 

log4j-1.2-api/src/main/java/org/apache/log4j/layout/Log4j1SyslogLayout.java

@@ -16,7 +16,6 @@
  */
 package org.apache.log4j.layout;
 
-import java.io.Serializable;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
@@ -76,7 +75,7 @@ public Builder() {
         private boolean header;
 
         @PluginElement("Layout")
-        private Layout<? extends Serializable> messageLayout;
+        private Layout<?> messageLayout;
 
         @Override
         public Log4j1SyslogLayout build() {
@@ -99,7 +98,7 @@ public boolean isHeader() {
             return header;
         }
 
-        public Layout<? extends Serializable> getMessageLayout() {
+        public Layout<?> getMessageLayout() {
             return messageLayout;
         }
 
@@ -118,7 +117,7 @@ public B setHeader(final boolean header) {
             return asBuilder();
         }
 
-        public B setMessageLayout(final Layout<? extends Serializable> messageLayout) {
+        public B setMessageLayout(final Layout<?> messageLayout) {
             this.messageLayout = messageLayout;
             return asBuilder();
         }
@@ -192,7 +191,9 @@ public String toSerializable(final LogEvent event) {
 
         buf.append(message);
         // TODO: splitting message into 1024 byte chunks?
-        return buf.toString();
+        final String result = buf.toString();
+        recycleStringBuilder(buf);
+        return result;
     }
 
     /**

log4j-1.2-api/src/main/java/org/apache/log4j/layout/Log4j1XmlLayout.java

@@ -78,13 +78,16 @@ public void encode(final LogEvent event, final ByteBufferDestination destination
         final StringBuilder text = getStringBuilder();
         formatTo(event, text);
         getStringBuilderEncoder().encode(text, destination);
+        recycleStringBuilder(text);
     }
 
     @Override
     public String toSerializable(final LogEvent event) {
         final StringBuilder text = getStringBuilder();
         formatTo(event, text);
-        return text.toString();
+        final String result = text.toString();
+        recycleStringBuilder(text);
+        return result;
     }
 
     private void formatTo(final LogEvent event, final StringBuilder buf) {

log4j-1.2-api/src/main/java/org/apache/log4j/rewrite/MapRewritePolicy.java

@@ -24,10 +24,10 @@
 import org.apache.log4j.spi.LocationInfo;
 import org.apache.log4j.spi.LoggingEvent;
 import org.apache.logging.log4j.core.LogEvent;
-import org.apache.logging.log4j.core.impl.Log4jLogEvent;
 import org.apache.logging.log4j.message.MapMessage;
 import org.apache.logging.log4j.message.Message;
 import org.apache.logging.log4j.message.SimpleMessage;
+import org.apache.logging.log4j.util.Cast;
 import org.apache.logging.log4j.util.SortedArrayStringMap;
 
 /**
@@ -54,10 +54,9 @@ public class MapRewritePolicy implements RewritePolicy {
     public LoggingEvent rewrite(final LoggingEvent source) {
         Object msg = source.getMessage();
         if (msg instanceof MapMessage || msg instanceof Map) {
-            Map<String, String> props = source.getProperties() != null ? new HashMap<>(source.getProperties())
+            Map<String, String> props = source.getProperties() != null ? new HashMap<>(Cast.cast(source.getProperties()))
                     : new HashMap<>();
-            @SuppressWarnings("unchecked")
-            Map<String, Object> eventProps = msg instanceof Map ? (Map) msg : ((MapMessage) msg).getData();
+            Map<String, Object> eventProps = Cast.cast(msg instanceof Map ? msg : ((MapMessage<?, ?>) msg).getData());
             //
             //   if the map sent in the logging request
             //      has "message" entry, use that as the message body
@@ -78,22 +77,21 @@ public LoggingEvent rewrite(final LoggingEvent source) {
 
             LogEvent event;
             if (source instanceof LogEventAdapter) {
-                event = new Log4jLogEvent.Builder(((LogEventAdapter) source).getEvent())
+                event = LogEvent.builderFrom(((LogEventAdapter) source).getEvent())
                         .setMessage(newMessage)
                         .setContextData(new SortedArrayStringMap(props))
-                        .build();
+                        .toImmutable();
             } else {
                 LocationInfo info = source.getLocationInformation();
                 StackTraceElement element = new StackTraceElement(info.getClassName(), info.getMethodName(),
                         info.getFileName(), Integer.parseInt(info.getLineNumber()));
                 Thread thread = getThread(source.getThreadName());
                 long threadId = thread != null ? thread.getId() : 0;
                 int threadPriority = thread != null ? thread.getPriority() : 0;
-                event = Log4jLogEvent.newBuilder()
+                event = LogEvent.builder()
                         .setContextData(new SortedArrayStringMap(props))
                         .setLevel(OptionConverter.convertLevel(source.getLevel()))
                         .setLoggerFqcn(source.getFQNOfLoggerClass())
-                        .setMarker(null)
                         .setMessage(newMessage)
                         .setSource(element)
                         .setLoggerName(source.getLoggerName())
@@ -102,9 +100,7 @@ public LoggingEvent rewrite(final LoggingEvent source) {
                         .setThreadPriority(threadPriority)
                         .setThrown(source.getThrowableInformation().getThrowable())
                         .setTimeMillis(source.getTimeStamp())
-                        .setNanoTime(0)
-                        .setThrownProxy(null)
-                        .build();
+                        .toImmutable();
             }
             return new LogEventAdapter(event);
         }