This is an automated email from the ASF dual-hosted git repository. rgoers pushed a commit to branch LoggerContextProperties in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 215ada50721cc42251289f5fc9afc9ad49e9921c Author: Ralph Goers <[email protected]> AuthorDate: Sun May 7 11:15:29 2023 -0700 Rebase with main --- .../src/test/java/org/apache/log4j/CategoryTest.java | 1 - log4j-1.2-api/src/test/java/org/apache/log4j/LoggerTest.java | 9 ++++----- .../apache/logging/log4j/test/junit/TestPropertySource.java | 1 - .../java/org/apache/logging/log4j/NoopThreadContextTest.java | 1 - .../apache/logging/log4j/ThreadContextInheritanceTest.java | 4 ---- .../apache/logging/log4j/util/PropertiesUtilOrderTest.java | 2 -- log4j-api-test/src/test/resources/Jira3413Test.properties | 2 +- .../src/main/java/org/apache/logging/log4j/LogManager.java | 1 - .../org/apache/logging/log4j/internal/util/FileUtil.java | 12 +++++------- .../org/apache/logging/log4j/spi/LoggingSystemProperty.java | 10 +++++----- .../java/org/apache/logging/log4j/spi/PropertyComponent.java | 10 +++++----- .../logging/log4j/util/ContextAwarePropertySource.java | 10 +++++----- .../apache/logging/log4j/util/EnvironmentPropertySource.java | 1 - .../java/org/apache/logging/log4j/util/PropertiesUtil.java | 1 - .../main/java/org/apache/logging/log4j/util/PropertyKey.java | 10 +++++----- .../java/org/apache/logging/log4j/util/PropertySource.java | 6 ------ .../apache/logging/log4j/util/ReloadablePropertySource.java | 10 +++++----- .../apache/logging/log4j/FilterPerformanceComparison.java | 1 - .../java/org/apache/logging/log4j/PerformanceComparison.java | 1 - .../log4j/core/appender/JsonCompleteFileAppenderTest.java | 1 - .../log4j/core/appender/XmlCompactFileAppenderTest.java | 1 - .../appender/XmlCompactFileAsyncAppenderValidationTest.java | 2 +- .../logging/log4j/core/appender/XmlFileAppenderTest.java | 1 - .../log4j/core/appender/XmlRandomAccessFileAppenderTest.java | 1 - .../logging/log4j/core/test/junit/LoggerContextResolver.java | 1 - .../logging/log4j/core/LoggerContextPropertiesTest.java | 10 +++++----- .../core/async/AsyncLoggerCustomSelectorLocationTest.java | 1 - .../QueueFullAsyncLoggerConfigLoggingFromToStringTest.java | 1 - .../async/QueueFullAsyncLoggerLoggingFromToStringTest.java | 2 -- .../logging/log4j/core/config/CustomConfigurationTest.java | 1 - .../log4j/core/config/xml/XmlConfigurationPropsTest.java | 2 -- .../logging/log4j/core/util/ContextDataProviderTest.java | 1 - .../log4j/core/annotation/ConditionalOnPropertyKey.java | 10 +++++----- .../log4j/core/annotation/OnPropertyKeyCondition.java | 10 +++++----- .../logging/log4j/core/config/DefaultConfiguration.java | 1 - .../apache/logging/log4j/core/impl/Log4jContextFactory.java | 1 - .../org/apache/logging/log4j/core/impl/Log4jPropertyKey.java | 10 +++++----- .../java/org/apache/logging/log4j/core/osgi/Activator.java | 3 --- .../org/apache/logging/log4j/core/time/ClockFactory.java | 1 - .../java/org/apache/logging/log4j/core/util/Constants.java | 1 - .../logging/log4j/core/util/ShutdownCallbackRegistry.java | 1 - .../java/org/apache/logging/log4j/core/util/UuidUtil.java | 1 - .../log4j/csv/layout/CsvParameterLayoutAllAsyncTest.java | 2 -- .../logging/log4j/flume/appender/FlumeEmbeddedAgentTest.java | 1 - .../log4j/flume/appender/FlumeEmbeddedAppenderTest.java | 2 +- .../log4j/flume/appender/FlumePersistentAppenderTest.java | 2 +- .../logging/log4j/flume/appender/FlumePersistentPerf.java | 2 +- .../log4j/jdbc/appender/DataSourceConnectionSourceTest.java | 1 + .../jdbc/appender/JdbcAppenderMapMessageDataSourceTest.java | 1 + .../main/java/org/apache/logging/log4j/jndi/JndiManager.java | 2 +- .../logging/log4j/jpa/appender/AbstractJpaAppenderTest.java | 1 - .../logging/log4j/jul/test/AsyncLoggerThreadsTest.java | 1 - .../log4j/kafka/builder/ConfigurationAssemblerTest.java | 2 -- .../apache/logging/log4j/perf/jmh/JdbcAppenderBenchmark.java | 1 - .../apache/logging/log4j/perf/jmh/JpaAppenderBenchmark.java | 1 - .../logging/log4j/plugins/condition/OnPropertyCondition.java | 1 - .../org/apache/logging/log4j/script/ScriptManagerImpl.java | 1 - .../script/config/builder/ConfigurationAssemblerTest.java | 2 -- .../log4j/spring/boot/Log4j2SpringBootLoggingSystemTest.java | 2 -- 59 files changed, 62 insertions(+), 120 deletions(-) diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/CategoryTest.java b/log4j-1.2-api/src/test/java/org/apache/log4j/CategoryTest.java index 516db0544a..0dcf3123a0 100644 --- a/log4j-1.2-api/src/test/java/org/apache/log4j/CategoryTest.java +++ b/log4j-1.2-api/src/test/java/org/apache/log4j/CategoryTest.java @@ -28,7 +28,6 @@ import org.apache.log4j.bridge.AppenderWrapper; import org.apache.log4j.spi.LoggingEvent; import org.apache.logging.log4j.core.Layout; import org.apache.logging.log4j.core.LogEvent; -import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.core.impl.Log4jPropertyKey; import org.apache.logging.log4j.core.layout.PatternLayout; import org.apache.logging.log4j.core.test.appender.ListAppender; diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/LoggerTest.java b/log4j-1.2-api/src/test/java/org/apache/log4j/LoggerTest.java index 684c5b8c3a..7da1c644b3 100644 --- a/log4j-1.2-api/src/test/java/org/apache/log4j/LoggerTest.java +++ b/log4j-1.2-api/src/test/java/org/apache/log4j/LoggerTest.java @@ -1,18 +1,18 @@ /* * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with + * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. * The ASF licenses this file to You under the Apache license, Version 2.0 * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the license for the specific language governing permissions and - * limitations under the license. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.log4j; @@ -24,7 +24,6 @@ import org.apache.logging.log4j.core.Appender; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.appender.AbstractAppender; -import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.core.config.Property; import org.apache.logging.log4j.core.impl.Log4jPropertyKey; import org.apache.logging.log4j.core.layout.PatternLayout; diff --git a/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/TestPropertySource.java b/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/TestPropertySource.java index c3feff521e..2a455a79bd 100644 --- a/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/TestPropertySource.java +++ b/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/TestPropertySource.java @@ -16,7 +16,6 @@ */ package org.apache.logging.log4j.test.junit; -import java.util.List; import org.apache.logging.log4j.test.TestProperties; import org.apache.logging.log4j.util.PropertySource; diff --git a/log4j-api-test/src/test/java/org/apache/logging/log4j/NoopThreadContextTest.java b/log4j-api-test/src/test/java/org/apache/logging/log4j/NoopThreadContextTest.java index da868a8700..6c73881880 100644 --- a/log4j-api-test/src/test/java/org/apache/logging/log4j/NoopThreadContextTest.java +++ b/log4j-api-test/src/test/java/org/apache/logging/log4j/NoopThreadContextTest.java @@ -19,7 +19,6 @@ package org.apache.logging.log4j; import org.apache.logging.log4j.spi.LoggingSystemProperty; import org.apache.logging.log4j.test.junit.InitializesThreadContext; import org.apache.logging.log4j.test.junit.UsingThreadContextMap; -import org.apache.logging.log4j.util.PropertiesUtil; import org.junit.jupiter.api.Test; import org.junitpioneer.jupiter.SetSystemProperty; diff --git a/log4j-api-test/src/test/java/org/apache/logging/log4j/ThreadContextInheritanceTest.java b/log4j-api-test/src/test/java/org/apache/logging/log4j/ThreadContextInheritanceTest.java index f8e872132f..979be39c66 100644 --- a/log4j-api-test/src/test/java/org/apache/logging/log4j/ThreadContextInheritanceTest.java +++ b/log4j-api-test/src/test/java/org/apache/logging/log4j/ThreadContextInheritanceTest.java @@ -21,14 +21,10 @@ import org.apache.logging.log4j.test.ThreadContextUtilityClass; import org.apache.logging.log4j.test.junit.InitializesThreadContext; import org.apache.logging.log4j.test.junit.UsingThreadContextMap; import org.apache.logging.log4j.test.junit.UsingThreadContextStack; -import org.apache.logging.log4j.util.PropertiesUtil; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junitpioneer.jupiter.SetSystemProperty; -import static org.apache.logging.log4j.spi.LoggingSystemProperty.THREAD_CONTEXT_MAP_INHERITABLE; import static org.junit.jupiter.api.Assertions.*; /** diff --git a/log4j-api-test/src/test/java/org/apache/logging/log4j/util/PropertiesUtilOrderTest.java b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/PropertiesUtilOrderTest.java index 1c5e92ec74..630274b892 100644 --- a/log4j-api-test/src/test/java/org/apache/logging/log4j/util/PropertiesUtilOrderTest.java +++ b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/PropertiesUtilOrderTest.java @@ -33,8 +33,6 @@ import uk.org.webcompere.systemstubs.properties.SystemProperties; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; @ExtendWith(SystemStubsExtension.class) diff --git a/log4j-api-test/src/test/resources/Jira3413Test.properties b/log4j-api-test/src/test/resources/Jira3413Test.properties index c8f0c02697..74d2417c61 100644 --- a/log4j-api-test/src/test/resources/Jira3413Test.properties +++ b/log4j-api-test/src/test/resources/Jira3413Test.properties @@ -31,4 +31,4 @@ log4j2.*.AsyncLoggerConfig.ringBufferSize=ok log4j2.*.ThreadContext.enable=ok log4j2.*.ThreadContext.enableStack=ok log4j2.*.ThreadContext.enableMap=ok -log4j2.*.ThreadContext.mapInheritable=ok \ No newline at end of file +log4j2.*.ThreadContext.mapInheritable=ok diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java b/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java index 0e901a0ee4..b13a9c5b85 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java @@ -24,7 +24,6 @@ import org.apache.logging.log4j.simple.SimpleLoggerContextFactory; import org.apache.logging.log4j.spi.LoggerContext; import org.apache.logging.log4j.spi.LoggerContextFactory; import org.apache.logging.log4j.spi.LoggingSystem; -import org.apache.logging.log4j.spi.LoggingSystemProperty; import org.apache.logging.log4j.spi.Terminable; import org.apache.logging.log4j.status.StatusLogger; import org.apache.logging.log4j.util.StackLocatorUtil; diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/internal/util/FileUtil.java b/log4j-api/src/main/java/org/apache/logging/log4j/internal/util/FileUtil.java index 1d635e2675..6113a6a1be 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/internal/util/FileUtil.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/internal/util/FileUtil.java @@ -1,25 +1,23 @@ /* * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with + * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache license, Version 2.0 + * The ASF licenses this file to you under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the license for the specific language governing permissions and - * limitations under the license. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.logging.log4j.internal.util; import java.io.File; -import java.io.InputStream; import java.net.URL; -import java.net.URLConnection; /** * Internal file utilities. diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggingSystemProperty.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggingSystemProperty.java index f147699551..e7edbe59a9 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggingSystemProperty.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggingSystemProperty.java @@ -1,18 +1,18 @@ /* * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with + * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache license, Version 2.0 + * The ASF licenses this file to you under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the license for the specific language governing permissions and - * limitations under the license. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.logging.log4j.spi; diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/PropertyComponent.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/PropertyComponent.java index bedc94c1e7..b7ba6bf950 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/PropertyComponent.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/PropertyComponent.java @@ -1,18 +1,18 @@ /* * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with + * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache license, Version 2.0 + * The ASF licenses this file to you under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the license for the specific language governing permissions and - * limitations under the license. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.logging.log4j.spi; diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/ContextAwarePropertySource.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/ContextAwarePropertySource.java index 3d761f81c9..b88f77ae37 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/util/ContextAwarePropertySource.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/ContextAwarePropertySource.java @@ -1,18 +1,18 @@ /* * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with + * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache license, Version 2.0 + * The ASF licenses this file to you under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the license for the specific language governing permissions and - * limitations under the license. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.logging.log4j.util; diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/EnvironmentPropertySource.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/EnvironmentPropertySource.java index e9357bf46f..044502b4fc 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/util/EnvironmentPropertySource.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/EnvironmentPropertySource.java @@ -16,7 +16,6 @@ */ package org.apache.logging.log4j.util; -import java.util.Map; import java.util.Properties; /** diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java index 602890a847..e618e4427a 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java @@ -28,7 +28,6 @@ import java.util.Collections; import java.util.Enumeration; import java.util.HashSet; import java.util.List; -import java.util.Locale; import java.util.Map; import java.util.Objects; import java.util.Properties; diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertyKey.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertyKey.java index bf782d8c80..13211f2201 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertyKey.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertyKey.java @@ -1,18 +1,18 @@ /* * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with + * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache license, Version 2.0 + * The ASF licenses this file to you under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the license for the specific language governing permissions and - * limitations under the license. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.logging.log4j.util; diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertySource.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertySource.java index 9540af2e3c..d40b033664 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertySource.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertySource.java @@ -19,22 +19,16 @@ package org.apache.logging.log4j.util; import java.io.InputStream; import java.net.URL; import java.nio.charset.StandardCharsets; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Enumeration; -import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Objects; -import java.util.Properties; import java.util.concurrent.ConcurrentHashMap; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import org.apache.logging.log4j.spi.PropertyComponent; /** * A source for global configuration properties. diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/ReloadablePropertySource.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/ReloadablePropertySource.java index 4820bc1a3d..1473c0c2f5 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/util/ReloadablePropertySource.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/ReloadablePropertySource.java @@ -1,18 +1,18 @@ /* * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with + * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache license, Version 2.0 + * The ASF licenses this file to you under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the license for the specific language governing permissions and - * limitations under the license. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.logging.log4j.util; diff --git a/log4j-core-its/src/test/java/org/apache/logging/log4j/FilterPerformanceComparison.java b/log4j-core-its/src/test/java/org/apache/logging/log4j/FilterPerformanceComparison.java index 5c71f142cd..46c1059655 100644 --- a/log4j-core-its/src/test/java/org/apache/logging/log4j/FilterPerformanceComparison.java +++ b/log4j-core-its/src/test/java/org/apache/logging/log4j/FilterPerformanceComparison.java @@ -20,7 +20,6 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.core.impl.Log4jPropertyKey; import org.apache.logging.log4j.core.test.categories.PerformanceTests; import org.junit.After; diff --git a/log4j-core-its/src/test/java/org/apache/logging/log4j/PerformanceComparison.java b/log4j-core-its/src/test/java/org/apache/logging/log4j/PerformanceComparison.java index 199af13515..203d6666fe 100644 --- a/log4j-core-its/src/test/java/org/apache/logging/log4j/PerformanceComparison.java +++ b/log4j-core-its/src/test/java/org/apache/logging/log4j/PerformanceComparison.java @@ -25,7 +25,6 @@ import java.io.Writer; import java.nio.ByteBuffer; import java.nio.channels.FileChannel; -import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.core.impl.Log4jPropertyKey; import org.apache.logging.log4j.core.test.categories.PerformanceTests; import org.apache.logging.log4j.core.test.util.Profiler; diff --git a/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/JsonCompleteFileAppenderTest.java b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/JsonCompleteFileAppenderTest.java index 325f74aeeb..5fe7713f9e 100644 --- a/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/JsonCompleteFileAppenderTest.java +++ b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/JsonCompleteFileAppenderTest.java @@ -28,7 +28,6 @@ import org.apache.logging.log4j.core.selector.CoreContextSelectors; import org.apache.logging.log4j.core.test.categories.Layouts; import org.apache.logging.log4j.core.test.junit.LoggerContextRule; import org.apache.logging.log4j.core.test.util.FixedTimeClock; -import org.apache.logging.log4j.core.time.ClockFactory; import org.apache.logging.log4j.test.junit.CleanFiles; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/XmlCompactFileAppenderTest.java b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/XmlCompactFileAppenderTest.java index 2d871043b9..81692c3d38 100644 --- a/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/XmlCompactFileAppenderTest.java +++ b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/XmlCompactFileAppenderTest.java @@ -22,7 +22,6 @@ import java.io.FileReader; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.core.impl.Log4jPropertyKey; import org.apache.logging.log4j.core.test.CoreLoggerContexts; import org.apache.logging.log4j.core.test.categories.Layouts; diff --git a/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/XmlCompactFileAsyncAppenderValidationTest.java b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/XmlCompactFileAsyncAppenderValidationTest.java index cb20b4ac0e..97e7a76fb5 100644 --- a/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/XmlCompactFileAsyncAppenderValidationTest.java +++ b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/XmlCompactFileAsyncAppenderValidationTest.java @@ -19,6 +19,7 @@ package org.apache.logging.log4j.core.appender; import java.io.File; import java.io.IOException; import java.net.URL; + import javax.xml.XMLConstants; import javax.xml.transform.Source; import javax.xml.transform.stream.StreamSource; @@ -28,7 +29,6 @@ import javax.xml.validation.Validator; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.core.impl.Log4jPropertyKey; import org.apache.logging.log4j.core.test.CoreLoggerContexts; import org.apache.logging.log4j.core.test.categories.Layouts; diff --git a/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/XmlFileAppenderTest.java b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/XmlFileAppenderTest.java index 480cffe51b..9439e2d328 100644 --- a/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/XmlFileAppenderTest.java +++ b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/XmlFileAppenderTest.java @@ -23,7 +23,6 @@ import java.util.List; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.core.impl.Log4jPropertyKey; import org.apache.logging.log4j.core.test.CoreLoggerContexts; import org.apache.logging.log4j.core.test.categories.Layouts; diff --git a/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/XmlRandomAccessFileAppenderTest.java b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/XmlRandomAccessFileAppenderTest.java index 373afed8e4..4573061f1b 100644 --- a/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/XmlRandomAccessFileAppenderTest.java +++ b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/XmlRandomAccessFileAppenderTest.java @@ -22,7 +22,6 @@ import java.io.FileReader; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.core.impl.Log4jPropertyKey; import org.apache.logging.log4j.core.test.CoreLoggerContexts; import org.apache.logging.log4j.core.test.categories.Layouts; diff --git a/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/junit/LoggerContextResolver.java b/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/junit/LoggerContextResolver.java index 9b1f5f0fbe..af6bc6f349 100644 --- a/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/junit/LoggerContextResolver.java +++ b/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/junit/LoggerContextResolver.java @@ -29,7 +29,6 @@ import org.apache.logging.log4j.core.util.NetUtils; import org.apache.logging.log4j.plugins.di.DI; import org.apache.logging.log4j.plugins.di.Injector; import org.apache.logging.log4j.test.junit.TypeBasedParameterResolver; -import org.apache.logging.log4j.util.PropertiesUtil; import org.junit.jupiter.api.extension.AfterEachCallback; import org.junit.jupiter.api.extension.BeforeAllCallback; import org.junit.jupiter.api.extension.BeforeEachCallback; diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/LoggerContextPropertiesTest.java b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/LoggerContextPropertiesTest.java index f8a06c8018..ac2f2bcbe0 100644 --- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/LoggerContextPropertiesTest.java +++ b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/LoggerContextPropertiesTest.java @@ -1,18 +1,18 @@ /* * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with + * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache license, Version 2.0 + * The ASF licenses this file to you under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the license for the specific language governing permissions and - * limitations under the license. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.logging.log4j.core; diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerCustomSelectorLocationTest.java b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerCustomSelectorLocationTest.java index ad73d2e3f1..24d0279776 100644 --- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerCustomSelectorLocationTest.java +++ b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerCustomSelectorLocationTest.java @@ -26,7 +26,6 @@ import java.util.List; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.LoggerContext; -import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.core.impl.Log4jPropertyKey; import org.apache.logging.log4j.core.selector.ContextSelector; import org.apache.logging.log4j.core.test.CoreLoggerContexts; diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/QueueFullAsyncLoggerConfigLoggingFromToStringTest.java b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/QueueFullAsyncLoggerConfigLoggingFromToStringTest.java index f4764bd485..75b55bd73c 100644 --- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/QueueFullAsyncLoggerConfigLoggingFromToStringTest.java +++ b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/QueueFullAsyncLoggerConfigLoggingFromToStringTest.java @@ -26,7 +26,6 @@ import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.impl.Log4jPropertyKey; import org.apache.logging.log4j.core.test.junit.LoggerContextSource; import org.apache.logging.log4j.plugins.Named; -import org.apache.logging.log4j.spi.LoggingSystemProperty; import org.apache.logging.log4j.status.StatusData; import org.apache.logging.log4j.status.StatusLogger; import org.junit.jupiter.api.Tag; diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/QueueFullAsyncLoggerLoggingFromToStringTest.java b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/QueueFullAsyncLoggerLoggingFromToStringTest.java index db3ec79cd7..dfbf769d47 100644 --- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/QueueFullAsyncLoggerLoggingFromToStringTest.java +++ b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/async/QueueFullAsyncLoggerLoggingFromToStringTest.java @@ -17,7 +17,6 @@ package org.apache.logging.log4j.core.async; import java.util.List; -import java.util.Stack; import java.util.concurrent.CountDownLatch; import org.apache.logging.log4j.Logger; @@ -36,7 +35,6 @@ import org.junit.runners.BlockJUnit4ClassRunner; import org.junitpioneer.jupiter.SetSystemProperty; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; /** * Tests queue full scenarios with pure AsyncLoggers (all loggers async). diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/CustomConfigurationTest.java b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/CustomConfigurationTest.java index 01729daffe..3bef416e99 100644 --- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/CustomConfigurationTest.java +++ b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/CustomConfigurationTest.java @@ -30,7 +30,6 @@ import org.apache.logging.log4j.core.config.xml.XmlConfiguration; import org.apache.logging.log4j.core.impl.Log4jPropertyKey; import org.apache.logging.log4j.core.layout.PatternLayout; import org.apache.logging.log4j.core.test.junit.LoggerContextSource; -import org.apache.logging.log4j.spi.LoggingSystemProperty; import org.apache.logging.log4j.status.StatusConsoleListener; import org.apache.logging.log4j.status.StatusListener; import org.apache.logging.log4j.status.StatusLogger; diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/xml/XmlConfigurationPropsTest.java b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/xml/XmlConfigurationPropsTest.java index 199ecc1bd5..d3f3dbb69b 100644 --- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/xml/XmlConfigurationPropsTest.java +++ b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/xml/XmlConfigurationPropsTest.java @@ -18,9 +18,7 @@ package org.apache.logging.log4j.core.config.xml; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.Configuration; -import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.core.impl.Log4jPropertyKey; -import org.apache.logging.log4j.core.util.Constants; import org.apache.logging.log4j.status.StatusLogger; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/util/ContextDataProviderTest.java b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/util/ContextDataProviderTest.java index c24052728e..7168b88623 100644 --- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/util/ContextDataProviderTest.java +++ b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/util/ContextDataProviderTest.java @@ -24,7 +24,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.ThreadContext; import org.apache.logging.log4j.core.LoggerContext; -import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.core.impl.Log4jPropertyKey; import org.apache.logging.log4j.core.impl.ThreadContextDataInjector; import org.apache.logging.log4j.core.test.appender.ListAppender; diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/annotation/ConditionalOnPropertyKey.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/annotation/ConditionalOnPropertyKey.java index 0a38e970cc..d58c04d985 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/annotation/ConditionalOnPropertyKey.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/annotation/ConditionalOnPropertyKey.java @@ -1,18 +1,18 @@ /* * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with + * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache license, Version 2.0 + * The ASF licenses this file to you under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the license for the specific language governing permissions and - * limitations under the license. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.logging.log4j.core.annotation; diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/annotation/OnPropertyKeyCondition.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/annotation/OnPropertyKeyCondition.java index 95a87702c3..b0c2e6839a 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/annotation/OnPropertyKeyCondition.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/annotation/OnPropertyKeyCondition.java @@ -1,18 +1,18 @@ /* * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with + * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache license, Version 2.0 + * The ASF licenses this file to you under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the license for the specific language governing permissions and - * limitations under the license. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.logging.log4j.core.annotation; diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java index 408238b5da..7f63f22b4d 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java @@ -16,7 +16,6 @@ */ package org.apache.logging.log4j.core.config; -import org.apache.logging.log4j.core.impl.Log4jPropertyKey; /** * The default configuration writes all output to the Console using the default logging level. You configure default diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jContextFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jContextFactory.java index 5e58213475..6854c61001 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jContextFactory.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jContextFactory.java @@ -32,7 +32,6 @@ import org.apache.logging.log4j.core.config.DefaultConfiguration; import org.apache.logging.log4j.core.config.composite.CompositeConfiguration; import org.apache.logging.log4j.core.selector.ContextSelector; import org.apache.logging.log4j.core.util.Cancellable; -import org.apache.logging.log4j.core.util.Constants; import org.apache.logging.log4j.core.util.ShutdownCallbackRegistry; import org.apache.logging.log4j.plugins.Inject; import org.apache.logging.log4j.plugins.Singleton; diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jPropertyKey.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jPropertyKey.java index 8b3e17baf2..e71dcd1ad2 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jPropertyKey.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jPropertyKey.java @@ -1,18 +1,18 @@ /* * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with + * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache license, Version 2.0 + * The ASF licenses this file to you under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the license for the specific language governing permissions and - * limitations under the license. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.logging.log4j.core.impl; diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/osgi/Activator.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/osgi/Activator.java index 23e96b540d..7570457780 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/osgi/Activator.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/osgi/Activator.java @@ -21,8 +21,6 @@ import java.util.List; import java.util.concurrent.atomic.AtomicReference; import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.core.LifeCycle; -import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.impl.Log4jPropertyKey; import org.apache.logging.log4j.core.selector.ContextSelector; import org.apache.logging.log4j.core.util.ContextDataProvider; @@ -32,7 +30,6 @@ import org.apache.logging.log4j.plugins.di.Key; import org.apache.logging.log4j.plugins.model.PluginRegistry; import org.apache.logging.log4j.plugins.model.PluginService; import org.apache.logging.log4j.util.PropertiesUtil; -import org.apache.logging.log4j.util.PropertyEnvironment; import org.apache.logging.log4j.util.ServiceRegistry; import org.osgi.framework.Bundle; import org.osgi.framework.BundleActivator; diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/time/ClockFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/time/ClockFactory.java index 29b1fe4eb5..9a55c415fc 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/time/ClockFactory.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/time/ClockFactory.java @@ -16,7 +16,6 @@ */ package org.apache.logging.log4j.core.time; -import org.apache.logging.log4j.core.impl.Log4jPropertyKey; import org.apache.logging.log4j.core.time.internal.CachedClock; import org.apache.logging.log4j.core.time.internal.CoarseCachedClock; import org.apache.logging.log4j.core.time.internal.SystemClock; diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Constants.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Constants.java index 50fb0a9bf7..9e6e150e39 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Constants.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Constants.java @@ -20,7 +20,6 @@ import org.apache.logging.log4j.Level; import org.apache.logging.log4j.core.impl.Log4jPropertyKey; import org.apache.logging.log4j.plugins.Named; import org.apache.logging.log4j.plugins.di.Key; -import org.apache.logging.log4j.spi.LoggingSystemProperty; import org.apache.logging.log4j.util.LoaderUtil; import org.apache.logging.log4j.util.PropertiesUtil; import org.apache.logging.log4j.util.PropertyKey; diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ShutdownCallbackRegistry.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ShutdownCallbackRegistry.java index 67756d5f3d..848d262e92 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ShutdownCallbackRegistry.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/ShutdownCallbackRegistry.java @@ -18,7 +18,6 @@ package org.apache.logging.log4j.core.util; import org.apache.logging.log4j.Marker; import org.apache.logging.log4j.MarkerManager; -import org.apache.logging.log4j.core.impl.Log4jPropertyKey; import org.apache.logging.log4j.plugins.di.Key; /** diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/UuidUtil.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/UuidUtil.java index abb25aaaa5..d05625b9ff 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/UuidUtil.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/UuidUtil.java @@ -22,7 +22,6 @@ import java.util.Random; import java.util.UUID; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.logging.log4j.core.impl.Log4jPropertyKey; import org.apache.logging.log4j.spi.LoggingSystemProperty; import org.apache.logging.log4j.util.PropertiesUtil; diff --git a/log4j-csv/src/test/java/org/apache/logging/log4j/csv/layout/CsvParameterLayoutAllAsyncTest.java b/log4j-csv/src/test/java/org/apache/logging/log4j/csv/layout/CsvParameterLayoutAllAsyncTest.java index d73f62533b..f83002633b 100644 --- a/log4j-csv/src/test/java/org/apache/logging/log4j/csv/layout/CsvParameterLayoutAllAsyncTest.java +++ b/log4j-csv/src/test/java/org/apache/logging/log4j/csv/layout/CsvParameterLayoutAllAsyncTest.java @@ -20,10 +20,8 @@ import org.apache.commons.csv.CSVFormat; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.core.Logger; import org.apache.logging.log4j.core.async.AsyncLoggerContextSelector; -import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.core.impl.Log4jPropertyKey; import org.apache.logging.log4j.core.test.categories.Layouts; -import org.apache.logging.log4j.core.util.Constants; import org.apache.logging.log4j.util.Strings; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAgentTest.java b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAgentTest.java index 802393718b..c33473578d 100644 --- a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAgentTest.java +++ b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAgentTest.java @@ -45,7 +45,6 @@ import org.apache.logging.log4j.EventLogger; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.LoggerContext; -import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.core.impl.Log4jPropertyKey; import org.apache.logging.log4j.core.test.AvailablePortFinder; import org.apache.logging.log4j.message.StructuredDataMessage; diff --git a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java index 4c29f98c3c..70cd149b9d 100644 --- a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java +++ b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java @@ -30,6 +30,7 @@ import java.util.Set; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; import java.util.zip.GZIPInputStream; + import javax.management.MBeanServer; import javax.management.ObjectName; @@ -45,7 +46,6 @@ import org.apache.logging.log4j.EventLogger; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.LoggerContext; -import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.core.impl.Log4jPropertyKey; import org.apache.logging.log4j.core.test.AvailablePortFinder; import org.apache.logging.log4j.message.StructuredDataMessage; diff --git a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java index 1df758a3e4..9b89345ceb 100644 --- a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java +++ b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java @@ -32,6 +32,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; import java.util.zip.GZIPInputStream; + import javax.management.MBeanServer; import javax.management.ObjectName; @@ -49,7 +50,6 @@ import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Marker; import org.apache.logging.log4j.MarkerManager; import org.apache.logging.log4j.core.LoggerContext; -import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.core.impl.Log4jPropertyKey; import org.apache.logging.log4j.core.test.AvailablePortFinder; import org.apache.logging.log4j.message.StructuredDataMessage; diff --git a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentPerf.java b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentPerf.java index fc4bd0aaee..4b52832874 100644 --- a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentPerf.java +++ b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentPerf.java @@ -30,6 +30,7 @@ import java.util.Set; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; import java.util.zip.GZIPInputStream; + import javax.management.MBeanServer; import javax.management.ObjectName; @@ -43,7 +44,6 @@ import org.apache.flume.source.avro.AvroSourceProtocol; import org.apache.flume.source.avro.Status; import org.apache.logging.log4j.EventLogger; import org.apache.logging.log4j.core.LoggerContext; -import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.core.impl.Log4jPropertyKey; import org.apache.logging.log4j.core.test.AvailablePortFinder; import org.apache.logging.log4j.message.StructuredDataMessage; diff --git a/log4j-jdbc/src/test/java/org/apache/logging/log4j/jdbc/appender/DataSourceConnectionSourceTest.java b/log4j-jdbc/src/test/java/org/apache/logging/log4j/jdbc/appender/DataSourceConnectionSourceTest.java index 8b5e195a17..60031d7e35 100644 --- a/log4j-jdbc/src/test/java/org/apache/logging/log4j/jdbc/appender/DataSourceConnectionSourceTest.java +++ b/log4j-jdbc/src/test/java/org/apache/logging/log4j/jdbc/appender/DataSourceConnectionSourceTest.java @@ -18,6 +18,7 @@ package org.apache.logging.log4j.jdbc.appender; import java.sql.Connection; import java.sql.SQLException; + import javax.sql.DataSource; import org.apache.logging.log4j.core.test.junit.LoggerContextRule; diff --git a/log4j-jdbc/src/test/java/org/apache/logging/log4j/jdbc/appender/JdbcAppenderMapMessageDataSourceTest.java b/log4j-jdbc/src/test/java/org/apache/logging/log4j/jdbc/appender/JdbcAppenderMapMessageDataSourceTest.java index 0c72c5074e..3fc241a7eb 100644 --- a/log4j-jdbc/src/test/java/org/apache/logging/log4j/jdbc/appender/JdbcAppenderMapMessageDataSourceTest.java +++ b/log4j-jdbc/src/test/java/org/apache/logging/log4j/jdbc/appender/JdbcAppenderMapMessageDataSourceTest.java @@ -23,6 +23,7 @@ import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; + import javax.sql.DataSource; import org.apache.commons.lang3.StringUtils; diff --git a/log4j-jndi/src/main/java/org/apache/logging/log4j/jndi/JndiManager.java b/log4j-jndi/src/main/java/org/apache/logging/log4j/jndi/JndiManager.java index 63ffe537b6..c19ce911a2 100644 --- a/log4j-jndi/src/main/java/org/apache/logging/log4j/jndi/JndiManager.java +++ b/log4j-jndi/src/main/java/org/apache/logging/log4j/jndi/JndiManager.java @@ -20,13 +20,13 @@ import java.net.URI; import java.net.URISyntaxException; import java.util.Properties; import java.util.concurrent.TimeUnit; + import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; import org.apache.logging.log4j.core.appender.AbstractManager; import org.apache.logging.log4j.core.appender.ManagerFactory; -import org.apache.logging.log4j.core.impl.Log4jPropertyKey; import org.apache.logging.log4j.core.util.Constants; import org.apache.logging.log4j.jndi.util.JndiCloser; diff --git a/log4j-jpa/src/test/java/org/apache/logging/log4j/jpa/appender/AbstractJpaAppenderTest.java b/log4j-jpa/src/test/java/org/apache/logging/log4j/jpa/appender/AbstractJpaAppenderTest.java index 7a9512c75f..c84b758928 100644 --- a/log4j-jpa/src/test/java/org/apache/logging/log4j/jpa/appender/AbstractJpaAppenderTest.java +++ b/log4j-jpa/src/test/java/org/apache/logging/log4j/jpa/appender/AbstractJpaAppenderTest.java @@ -27,7 +27,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.Appender; import org.apache.logging.log4j.core.LoggerContext; -import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.core.config.DefaultConfiguration; import org.apache.logging.log4j.core.impl.Log4jPropertyKey; import org.apache.logging.log4j.core.test.categories.Appenders; diff --git a/log4j-jul/src/test/java/org/apache/logging/log4j/jul/test/AsyncLoggerThreadsTest.java b/log4j-jul/src/test/java/org/apache/logging/log4j/jul/test/AsyncLoggerThreadsTest.java index cb2bf7602f..da5650fd96 100644 --- a/log4j-jul/src/test/java/org/apache/logging/log4j/jul/test/AsyncLoggerThreadsTest.java +++ b/log4j-jul/src/test/java/org/apache/logging/log4j/jul/test/AsyncLoggerThreadsTest.java @@ -22,7 +22,6 @@ import java.util.stream.Collectors; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.core.async.AsyncLoggerContextSelector; import org.apache.logging.log4j.core.impl.Log4jPropertyKey; -import org.apache.logging.log4j.core.util.Constants; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Ignore; diff --git a/log4j-kafka/src/test/java/org/apache/logging/log4j/kafka/builder/ConfigurationAssemblerTest.java b/log4j-kafka/src/test/java/org/apache/logging/log4j/kafka/builder/ConfigurationAssemblerTest.java index f0f2d2274c..4bf18a8b13 100644 --- a/log4j-kafka/src/test/java/org/apache/logging/log4j/kafka/builder/ConfigurationAssemblerTest.java +++ b/log4j-kafka/src/test/java/org/apache/logging/log4j/kafka/builder/ConfigurationAssemblerTest.java @@ -27,7 +27,6 @@ import org.apache.logging.log4j.core.Filter; import org.apache.logging.log4j.core.LifeCycle; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.Configuration; -import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.core.config.Configurator; import org.apache.logging.log4j.core.config.CustomLevelConfig; import org.apache.logging.log4j.core.config.LoggerConfig; @@ -37,7 +36,6 @@ import org.apache.logging.log4j.core.config.builder.impl.BuiltConfiguration; import org.apache.logging.log4j.core.filter.ThresholdFilter; import org.apache.logging.log4j.core.impl.Log4jPropertyKey; import org.apache.logging.log4j.core.layout.GelfLayout; -import org.apache.logging.log4j.core.util.Constants; import org.apache.logging.log4j.kafka.appender.KafkaAppender; import org.junit.Test; diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/JdbcAppenderBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/JdbcAppenderBenchmark.java index 84eaadf515..c80866417c 100644 --- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/JdbcAppenderBenchmark.java +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/JdbcAppenderBenchmark.java @@ -25,7 +25,6 @@ import java.util.concurrent.TimeUnit; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.LoggerContext; -import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.core.config.DefaultConfiguration; import org.apache.logging.log4j.core.impl.Log4jPropertyKey; import org.apache.logging.log4j.core.util.Closer; diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/JpaAppenderBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/JpaAppenderBenchmark.java index 31b638eeaf..86f70749a7 100644 --- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/JpaAppenderBenchmark.java +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/JpaAppenderBenchmark.java @@ -25,7 +25,6 @@ import java.util.concurrent.TimeUnit; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.LoggerContext; -import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.core.config.DefaultConfiguration; import org.apache.logging.log4j.core.impl.Log4jPropertyKey; import org.apache.logging.log4j.core.util.Closer; diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/condition/OnPropertyCondition.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/condition/OnPropertyCondition.java index 760c4bcca9..bb1e093689 100644 --- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/condition/OnPropertyCondition.java +++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/condition/OnPropertyCondition.java @@ -24,7 +24,6 @@ import org.apache.logging.log4j.plugins.di.Key; import org.apache.logging.log4j.plugins.util.AnnotationUtil; import org.apache.logging.log4j.status.StatusLogger; import org.apache.logging.log4j.util.PropertiesUtil; -import org.apache.logging.log4j.util.PropertyKey; @Singleton public class OnPropertyCondition implements Condition { diff --git a/log4j-script/src/main/java/org/apache/logging/log4j/script/ScriptManagerImpl.java b/log4j-script/src/main/java/org/apache/logging/log4j/script/ScriptManagerImpl.java index 4f9be4dfc9..f3aabb14b5 100644 --- a/log4j-script/src/main/java/org/apache/logging/log4j/script/ScriptManagerImpl.java +++ b/log4j-script/src/main/java/org/apache/logging/log4j/script/ScriptManagerImpl.java @@ -46,7 +46,6 @@ import org.apache.logging.log4j.core.script.ScriptManager; import org.apache.logging.log4j.core.util.FileWatcher; import org.apache.logging.log4j.core.util.WatchManager; import org.apache.logging.log4j.plugins.Node; -import org.apache.logging.log4j.script.factory.ScriptManagerFactoryImpl; import org.apache.logging.log4j.status.StatusLogger; import org.apache.logging.log4j.util.PropertiesUtil; import org.apache.logging.log4j.util.Strings; diff --git a/log4j-script/src/test/java/org/apache/logging/log4j/script/config/builder/ConfigurationAssemblerTest.java b/log4j-script/src/test/java/org/apache/logging/log4j/script/config/builder/ConfigurationAssemblerTest.java index 8565b12e66..56e30fe6ab 100644 --- a/log4j-script/src/test/java/org/apache/logging/log4j/script/config/builder/ConfigurationAssemblerTest.java +++ b/log4j-script/src/test/java/org/apache/logging/log4j/script/config/builder/ConfigurationAssemblerTest.java @@ -28,7 +28,6 @@ import org.apache.logging.log4j.core.LifeCycle; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.appender.ConsoleAppender; import org.apache.logging.log4j.core.config.Configuration; -import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.core.config.Configurator; import org.apache.logging.log4j.core.config.CustomLevelConfig; import org.apache.logging.log4j.core.config.LoggerConfig; @@ -38,7 +37,6 @@ import org.apache.logging.log4j.core.config.builder.impl.BuiltConfiguration; import org.apache.logging.log4j.core.filter.ThresholdFilter; import org.apache.logging.log4j.core.impl.Log4jPropertyKey; import org.apache.logging.log4j.core.layout.PatternLayout; -import org.apache.logging.log4j.core.util.Constants; import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/log4j-spring-boot/src/test/java/org/apache/logging/log4j/spring/boot/Log4j2SpringBootLoggingSystemTest.java b/log4j-spring-boot/src/test/java/org/apache/logging/log4j/spring/boot/Log4j2SpringBootLoggingSystemTest.java index e3c74b4d47..36869f2c74 100644 --- a/log4j-spring-boot/src/test/java/org/apache/logging/log4j/spring/boot/Log4j2SpringBootLoggingSystemTest.java +++ b/log4j-spring-boot/src/test/java/org/apache/logging/log4j/spring/boot/Log4j2SpringBootLoggingSystemTest.java @@ -20,11 +20,9 @@ import java.util.Arrays; import java.util.List; import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.core.impl.Log4jPropertyKey; import org.apache.logging.log4j.spi.LoggerContext; import org.apache.logging.log4j.spi.LoggingSystemProperty; -import org.apache.logging.log4j.util.PropertyKey; import org.junit.jupiter.api.Test; import org.junitpioneer.jupiter.SetSystemProperty; import org.springframework.boot.logging.LoggingSystem;
