Remove Supplier

log4j-api-test/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java

@@ -25,6 +25,7 @@
 import static org.junit.jupiter.api.Assertions.fail;
 
 import java.util.List;
+import java.util.function.Supplier;
 import org.apache.logging.log4j.message.Message;
 import org.apache.logging.log4j.message.ObjectMessage;
 import org.apache.logging.log4j.message.ParameterizedMessage;
@@ -36,7 +37,6 @@
 import org.apache.logging.log4j.test.junit.Resources;
 import org.apache.logging.log4j.test.junit.StatusLoggerLevel;
 import org.apache.logging.log4j.util.MessageSupplier;
-import org.apache.logging.log4j.util.Supplier;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.parallel.ResourceAccessMode;
 import org.junit.jupiter.api.parallel.ResourceLock;

log4j-api-test/src/test/java/org/apache/logging/log4j/LambdaLoggerTest.java

@@ -20,11 +20,11 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Supplier;
 import org.apache.logging.log4j.message.Message;
 import org.apache.logging.log4j.message.ReusableMessage;
 import org.apache.logging.log4j.message.SimpleMessage;
 import org.apache.logging.log4j.spi.AbstractLogger;
-import org.apache.logging.log4j.util.Supplier;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 

log4j-api-test/src/test/java/org/apache/logging/log4j/LoggerSupplierTest.java

@@ -21,6 +21,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Properties;
+import java.util.function.Supplier;
 import org.apache.logging.log4j.message.FormattedMessage;
 import org.apache.logging.log4j.message.JsonMessage;
 import org.apache.logging.log4j.message.LocalizedMessage;
@@ -33,7 +34,6 @@
 import org.apache.logging.log4j.message.ThreadDumpMessage;
 import org.apache.logging.log4j.test.TestLogger;
 import org.apache.logging.log4j.test.junit.UsingThreadContextMap;
-import org.apache.logging.log4j.util.Supplier;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

log4j-api-test/src/test/java/org/apache/logging/log4j/LoggerTest.java

@@ -29,6 +29,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Properties;
+import java.util.function.Supplier;
 import org.apache.logging.log4j.message.EntryMessage;
 import org.apache.logging.log4j.message.JsonMessage;
 import org.apache.logging.log4j.message.Message;
@@ -45,7 +46,6 @@
 import org.apache.logging.log4j.test.junit.Resources;
 import org.apache.logging.log4j.test.junit.UsingThreadContextMap;
 import org.apache.logging.log4j.util.Strings;
-import org.apache.logging.log4j.util.Supplier;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;

log4j-api-test/src/test/java/org/apache/logging/log4j/util/LambdaUtilTest.java

@@ -18,6 +18,7 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
+import java.util.function.Supplier;
 import org.apache.logging.log4j.message.Message;
 import org.apache.logging.log4j.message.SimpleMessage;
 import org.junit.jupiter.api.Test;

log4j-api/src/main/java/org/apache/logging/log4j/LogBuilder.java

@@ -16,8 +16,8 @@
  */
 package org.apache.logging.log4j;
 
+import java.util.function.Supplier;
 import org.apache.logging.log4j.message.Message;
-import org.apache.logging.log4j.util.Supplier;
 
 /**
  * Interface for constructing log events before logging them. Instances of LogBuilders should only be created

log4j-api/src/main/java/org/apache/logging/log4j/Logger.java

@@ -16,12 +16,12 @@
  */
 package org.apache.logging.log4j;
 
+import java.util.function.Supplier;
 import org.apache.logging.log4j.message.EntryMessage;
 import org.apache.logging.log4j.message.FlowMessageFactory;
 import org.apache.logging.log4j.message.Message;
 import org.apache.logging.log4j.message.MessageFactory;
 import org.apache.logging.log4j.util.MessageSupplier;
-import org.apache.logging.log4j.util.Supplier;
 
 /**
  * This is the central interface in the log4j package. Most logging operations, except configuration, are done through

log4j-api/src/main/java/org/apache/logging/log4j/internal/DefaultLogBuilder.java

@@ -17,6 +17,7 @@
 package org.apache.logging.log4j.internal;
 
 import java.util.Arrays;
+import java.util.function.Supplier;
 import org.apache.logging.log4j.BridgeAware;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogBuilder;

log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java

@@ -16,6 +16,7 @@
  */
 package org.apache.logging.log4j.spi;
 
+import java.util.function.Supplier;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogBuilder;
 import org.apache.logging.log4j.LoggingException;
@@ -35,7 +36,6 @@
 import org.apache.logging.log4j.util.MessageSupplier;
 import org.apache.logging.log4j.util.PerformanceSensitive;
 import org.apache.logging.log4j.util.StackLocatorUtil;
-import org.apache.logging.log4j.util.Supplier;
 
 /**
  * Base implementation of a Logger. It is highly recommended that any Logger implementation extend this class.

log4j-api/src/main/java/org/apache/logging/log4j/spi/ExtendedLogger.java

@@ -16,12 +16,12 @@
  */
 package org.apache.logging.log4j.spi;
 
+import java.util.function.Supplier;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.Marker;
 import org.apache.logging.log4j.message.Message;
 import org.apache.logging.log4j.util.MessageSupplier;
-import org.apache.logging.log4j.util.Supplier;
 
 /**
  * Extends the {@code Logger} interface with methods that facilitate implementing or extending {@code Logger}s. Users

log4j-api/src/main/java/org/apache/logging/log4j/util/LambdaUtil.java

@@ -16,6 +16,7 @@
  */
 package org.apache.logging.log4j.util;
 
+import java.util.function.Supplier;
 import org.apache.logging.log4j.message.Message;
 import org.apache.logging.log4j.message.MessageFactory;
 

log4j-api/src/main/java/org/apache/logging/log4j/util/MessageSupplier.java

@@ -16,6 +16,7 @@
  */
 package org.apache.logging.log4j.util;
 
+import java.util.function.Supplier;
 import org.apache.logging.log4j.message.Message;
 
 /**

log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java

@@ -43,6 +43,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import org.apache.logging.log4j.internal.CopyOnWriteNavigableSet;
 

log4j-api/src/main/java/org/apache/logging/log4j/util/PropertyEnvironment.java

@@ -19,6 +19,7 @@
 import java.nio.charset.Charset;
 import java.time.Duration;
 import java.util.ResourceBundle;
+import java.util.function.Supplier;
 
 public interface PropertyEnvironment {
 

log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/MockReliabilityStrategy.java

@@ -21,13 +21,13 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.function.Supplier;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.Marker;
 import org.apache.logging.log4j.core.Appender;
 import org.apache.logging.log4j.core.LifeCycle;
 import org.apache.logging.log4j.core.LogEvent;
 import org.apache.logging.log4j.message.Message;
-import org.apache.logging.log4j.util.Supplier;
 import org.opentest4j.MultipleFailuresError;
 
 /**

log4j-core-test/src/test/java/org/apache/logging/log4j/core/tools/GenerateCustomLoggerTest.java

@@ -28,6 +28,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
+import java.util.function.Supplier;
 import javax.tools.Diagnostic;
 import javax.tools.DiagnosticCollector;
 import javax.tools.JavaCompiler;
@@ -42,7 +43,6 @@
 import org.apache.logging.log4j.test.TestLogger;
 import org.apache.logging.log4j.util.MessageSupplier;
 import org.apache.logging.log4j.util.Strings;
-import org.apache.logging.log4j.util.Supplier;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;

log4j-core-test/src/test/java/org/apache/logging/log4j/core/tools/GenerateExtendedLoggerTest.java

@@ -28,6 +28,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
+import java.util.function.Supplier;
 import javax.tools.Diagnostic;
 import javax.tools.DiagnosticCollector;
 import javax.tools.JavaCompiler;
@@ -43,7 +44,6 @@
 import org.apache.logging.log4j.test.TestLogger;
 import org.apache.logging.log4j.util.MessageSupplier;
 import org.apache.logging.log4j.util.Strings;
-import org.apache.logging.log4j.util.Supplier;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;

log4j-core/src/main/java/org/apache/logging/log4j/core/Logger.java

@@ -21,6 +21,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Supplier;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogBuilder;
 import org.apache.logging.log4j.Marker;
@@ -33,7 +34,6 @@
 import org.apache.logging.log4j.message.SimpleMessage;
 import org.apache.logging.log4j.spi.AbstractLogger;
 import org.apache.logging.log4j.util.Strings;
-import org.apache.logging.log4j.util.Supplier;
 
 /**
  * The core implementation of the {@link org.apache.logging.log4j.Logger} interface. Besides providing an implementation

log4j-core/src/main/java/org/apache/logging/log4j/core/config/AwaitCompletionReliabilityStrategy.java

@@ -23,11 +23,11 @@
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
+import java.util.function.Supplier;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.Marker;
 import org.apache.logging.log4j.core.LogEvent;
 import org.apache.logging.log4j.message.Message;
-import org.apache.logging.log4j.util.Supplier;
 
 /**
  * ReliabilityStrategy that counts the number of threads that have started to log an event but have not completed yet,

log4j-core/src/main/java/org/apache/logging/log4j/core/config/AwaitUnconditionallyReliabilityStrategy.java

@@ -17,14 +17,14 @@
 package org.apache.logging.log4j.core.config;
 
 import java.util.Objects;
+import java.util.function.Supplier;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.Marker;
 import org.apache.logging.log4j.core.LogEvent;
 import org.apache.logging.log4j.core.impl.Log4jPropertyKey;
 import org.apache.logging.log4j.message.Message;
 import org.apache.logging.log4j.status.StatusLogger;
 import org.apache.logging.log4j.util.PropertiesUtil;
-import org.apache.logging.log4j.util.Supplier;
 
 /**
  * Reliability strategy that sleeps unconditionally for some time before allowing a Configuration to be stopped.

log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultReliabilityStrategy.java

@@ -17,11 +17,11 @@
 package org.apache.logging.log4j.core.config;
 
 import java.util.Objects;
+import java.util.function.Supplier;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.Marker;
 import org.apache.logging.log4j.core.LogEvent;
 import org.apache.logging.log4j.message.Message;
-import org.apache.logging.log4j.util.Supplier;
 
 /**
  * Reliability strategy that assumes reconfigurations will never take place.

log4j-core/src/main/java/org/apache/logging/log4j/core/config/LockingReliabilityStrategy.java

@@ -19,11 +19,11 @@
 import java.util.Objects;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.function.Supplier;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.Marker;
 import org.apache.logging.log4j.core.LogEvent;
 import org.apache.logging.log4j.message.Message;
-import org.apache.logging.log4j.util.Supplier;
 
 /**
  * ReliabilityStrategy that uses read/write locks to prevent the LoggerConfig from stopping while it is in use.

log4j-core/src/main/java/org/apache/logging/log4j/core/config/ReliabilityStrategy.java

@@ -16,11 +16,11 @@
  */
 package org.apache.logging.log4j.core.config;
 
+import java.util.function.Supplier;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.Marker;
 import org.apache.logging.log4j.core.LogEvent;
 import org.apache.logging.log4j.message.Message;
-import org.apache.logging.log4j.util.Supplier;
 
 /**
  * Interface for objects that know how to ensure delivery of log events to the appropriate appenders, even during and

log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLogBuilder.java

@@ -16,6 +16,7 @@
  */
 package org.apache.logging.slf4j;
 
+import java.util.function.Supplier;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogBuilder;
 import org.apache.logging.log4j.Logger;
@@ -26,7 +27,6 @@
 import org.apache.logging.log4j.status.StatusLogger;
 import org.apache.logging.log4j.util.LambdaUtil;
 import org.apache.logging.log4j.util.StackLocatorUtil;
-import org.apache.logging.log4j.util.Supplier;
 
 public class SLF4JLogBuilder implements LogBuilder {
 

src/changelog/.3.x.x/remove_DefaultLogEventFactory.xml

@@ -4,6 +4,6 @@
        xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.3.xsd"
        type="removed">
   <description format="asciidoc">
-    Remove `DefaultLogEventFactory`
+    Remove `org.apache.logging.log4j.core.impl.DefaultLogEventFactory`
   </description>
 </entry>

src/changelog/.3.x.x/remove_Supplier.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns="http://logging.apache.org/log4j/changelog"
+       xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.3.xsd"
+       type="removed">
+  <issue id="2175" link="https://github.com/apache/logging-log4j2/pull/2175"/>
+  <description format="asciidoc">
+    Remove `org.apache.logging.log4j.util.Supplier` in favor of `java.util.function.Supplier`
+  </description>
+</entry>

src/site/_release-notes/_3.x.x.adoc

@@ -47,7 +47,8 @@ This release contains...
 [#release-notes-3-x-x-removed]
 === Removed
 
-* Remove `DefaultLogEventFactory`
+* Remove `org.apache.logging.log4j.core.impl.DefaultLogEventFactory`
+* Remove `org.apache.logging.log4j.util.Supplier` in favor of `java.util.function.Supplier` (https://github.com/apache/logging-log4j2/pull/2175[2175])
 * Remove `org.apache.logging.log4j.core.parser` and related packages. (https://github.com/apache/logging-log4j2/pull/2154[2154])
 * Remove `log4j2.enable.threadlocals` property (https://github.com/apache/logging-log4j2/issues/2105[2105])