This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/2.x by this push:
new 75ab43e453 Backport `log4j-jul` non-breaking changes from `main`
75ab43e453 is described below
commit 75ab43e453606155193584776169058c2c942f4a
Author: Piotr P. Karwasz <[email protected]>
AuthorDate: Thu Jan 4 10:42:49 2024 +0100
Backport `log4j-jul` non-breaking changes from `main`
---
.../main/java/org/apache/logging/log4j/jul/ApiLogger.java | 10 +++++-----
.../java/org/apache/logging/log4j/jul/WrappedLogger.java | 11 +++++++++++
.../logging/log4j/jul/{ => test}/AbstractLoggerTest.java | 4 +++-
.../apache/logging/log4j/jul/{ => test}/ApiLoggerTest.java | 14 ++++++--------
.../log4j/jul/{ => test}/AsyncLoggerThreadsTest.java | 2 +-
.../{ => test}/BracketInNotInterpolatedMessageTest.java | 3 ++-
.../log4j/jul/{ => test}/CallerInformationTest.java | 3 ++-
.../logging/log4j/jul/{ => test}/CoreLoggerTest.java | 3 ++-
.../DefaultLevelConverterCustomJulLevelsTest.java | 4 +++-
.../log4j/jul/{ => test}/DefaultLevelConverterTest.java | 3 ++-
.../log4j/jul/{ => test}/JavaLevelTranslatorTest.java | 3 ++-
.../log4j/jul/{ => test}/Log4jBridgeHandlerTest.java | 2 +-
.../log4j/jul/{ => test}/Log4jLevelTranslatorTest.java | 3 ++-
log4j-jul/src/test/resources/log4j2-julBridge-test.xml | 2 +-
14 files changed, 43 insertions(+), 24 deletions(-)
diff --git
a/log4j-jul/src/main/java/org/apache/logging/log4j/jul/ApiLogger.java
b/log4j-jul/src/main/java/org/apache/logging/log4j/jul/ApiLogger.java
index 528e21f159..eee946fc8c 100644
--- a/log4j-jul/src/main/java/org/apache/logging/log4j/jul/ApiLogger.java
+++ b/log4j-jul/src/main/java/org/apache/logging/log4j/jul/ApiLogger.java
@@ -232,27 +232,27 @@ public class ApiLogger extends Logger {
@Override
public void entering(final String sourceClass, final String sourceMethod) {
- logger.entry();
+ logger.traceEntry();
}
@Override
public void entering(final String sourceClass, final String sourceMethod,
final Object param1) {
- logger.entry(param1);
+ logger.traceEntry(null, param1);
}
@Override
public void entering(final String sourceClass, final String sourceMethod,
final Object[] params) {
- logger.entry(params);
+ logger.traceEntry(null, params);
}
@Override
public void exiting(final String sourceClass, final String sourceMethod) {
- logger.exit();
+ logger.traceExit();
}
@Override
public void exiting(final String sourceClass, final String sourceMethod,
final Object result) {
- logger.exit(result);
+ logger.traceExit(result);
}
@Override
diff --git
a/log4j-jul/src/main/java/org/apache/logging/log4j/jul/WrappedLogger.java
b/log4j-jul/src/main/java/org/apache/logging/log4j/jul/WrappedLogger.java
index 665e0a5f8e..12490dce41 100644
--- a/log4j-jul/src/main/java/org/apache/logging/log4j/jul/WrappedLogger.java
+++ b/log4j-jul/src/main/java/org/apache/logging/log4j/jul/WrappedLogger.java
@@ -17,6 +17,7 @@
package org.apache.logging.log4j.jul;
import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.message.EntryMessage;
import org.apache.logging.log4j.spi.ExtendedLogger;
import org.apache.logging.log4j.spi.ExtendedLoggerWrapper;
@@ -69,6 +70,16 @@ class WrappedLogger extends ExtendedLoggerWrapper {
return exit(FQCN, result);
}
+ @Override
+ public EntryMessage traceEntry() {
+ return enter(FQCN, null, (Object[]) null);
+ }
+
+ @Override
+ public EntryMessage traceEntry(final String message, final Object...
params) {
+ return enter(FQCN, message, params);
+ }
+
@Override
public <T extends Throwable> T throwing(final T t) {
return throwing(FQCN,
LevelTranslator.toLevel(java.util.logging.Level.FINER), t);
diff --git
a/log4j-jul/src/test/java/org/apache/logging/log4j/jul/AbstractLoggerTest.java
b/log4j-jul/src/test/java/org/apache/logging/log4j/jul/test/AbstractLoggerTest.java
similarity index 98%
rename from
log4j-jul/src/test/java/org/apache/logging/log4j/jul/AbstractLoggerTest.java
rename to
log4j-jul/src/test/java/org/apache/logging/log4j/jul/test/AbstractLoggerTest.java
index 68394b0913..75c4888f52 100644
---
a/log4j-jul/src/test/java/org/apache/logging/log4j/jul/AbstractLoggerTest.java
+++
b/log4j-jul/src/test/java/org/apache/logging/log4j/jul/test/AbstractLoggerTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.logging.log4j.jul;
+package org.apache.logging.log4j.jul.test;
import static org.assertj.core.api.Assertions.assertThat;
@@ -24,6 +24,8 @@ import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.impl.Log4jLogEvent;
import org.apache.logging.log4j.core.test.appender.ListAppender;
+import org.apache.logging.log4j.jul.ApiLogger;
+import org.apache.logging.log4j.jul.LevelTranslator;
import org.junit.Test;
/**
diff --git
a/log4j-jul/src/test/java/org/apache/logging/log4j/jul/ApiLoggerTest.java
b/log4j-jul/src/test/java/org/apache/logging/log4j/jul/test/ApiLoggerTest.java
similarity index 91%
rename from
log4j-jul/src/test/java/org/apache/logging/log4j/jul/ApiLoggerTest.java
rename to
log4j-jul/src/test/java/org/apache/logging/log4j/jul/test/ApiLoggerTest.java
index c5462a7345..a20b4cc7be 100644
--- a/log4j-jul/src/test/java/org/apache/logging/log4j/jul/ApiLoggerTest.java
+++
b/log4j-jul/src/test/java/org/apache/logging/log4j/jul/test/ApiLoggerTest.java
@@ -14,16 +14,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.logging.log4j.jul;
+package org.apache.logging.log4j.jul.test;
import static org.hamcrest.Matchers.equalTo;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
import java.util.logging.Logger;
import org.apache.logging.log4j.core.test.appender.ListAppender;
+import org.apache.logging.log4j.jul.ApiLoggerAdapter;
+import org.apache.logging.log4j.jul.Constants;
+import org.apache.logging.log4j.jul.LogManager;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
@@ -82,11 +84,7 @@ public class ApiLoggerTest extends AbstractLoggerTest {
}
@Test
- public void testSetLevelDoesNotFail() throws Exception {
- try {
- logger.setLevel(null);
- } catch (Throwable e) {
- fail("should not throw");
- }
+ public void testSetLevelFails() throws Exception {
+ logger.setLevel(null);
}
}
diff --git
a/log4j-jul/src/test/java/org/apache/logging/log4j/jul/AsyncLoggerThreadsTest.java
b/log4j-jul/src/test/java/org/apache/logging/log4j/jul/test/AsyncLoggerThreadsTest.java
similarity index 98%
rename from
log4j-jul/src/test/java/org/apache/logging/log4j/jul/AsyncLoggerThreadsTest.java
rename to
log4j-jul/src/test/java/org/apache/logging/log4j/jul/test/AsyncLoggerThreadsTest.java
index 19867be01f..0a04ba0901 100644
---
a/log4j-jul/src/test/java/org/apache/logging/log4j/jul/AsyncLoggerThreadsTest.java
+++
b/log4j-jul/src/test/java/org/apache/logging/log4j/jul/test/AsyncLoggerThreadsTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.logging.log4j.jul;
+package org.apache.logging.log4j.jul.test;
import static org.junit.Assert.assertEquals;
diff --git
a/log4j-jul/src/test/java/org/apache/logging/log4j/jul/BracketInNotInterpolatedMessageTest.java
b/log4j-jul/src/test/java/org/apache/logging/log4j/jul/test/BracketInNotInterpolatedMessageTest.java
similarity index 95%
rename from
log4j-jul/src/test/java/org/apache/logging/log4j/jul/BracketInNotInterpolatedMessageTest.java
rename to
log4j-jul/src/test/java/org/apache/logging/log4j/jul/test/BracketInNotInterpolatedMessageTest.java
index 14ebaefecc..adb106d2a5 100644
---
a/log4j-jul/src/test/java/org/apache/logging/log4j/jul/BracketInNotInterpolatedMessageTest.java
+++
b/log4j-jul/src/test/java/org/apache/logging/log4j/jul/test/BracketInNotInterpolatedMessageTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.logging.log4j.jul;
+package org.apache.logging.log4j.jul.test;
import static java.util.logging.Level.INFO;
import static org.hamcrest.Matchers.hasSize;
@@ -25,6 +25,7 @@ import java.util.logging.LogRecord;
import java.util.logging.Logger;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.test.appender.ListAppender;
+import org.apache.logging.log4j.jul.LogManager;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git
a/log4j-jul/src/test/java/org/apache/logging/log4j/jul/CallerInformationTest.java
b/log4j-jul/src/test/java/org/apache/logging/log4j/jul/test/CallerInformationTest.java
similarity index 97%
rename from
log4j-jul/src/test/java/org/apache/logging/log4j/jul/CallerInformationTest.java
rename to
log4j-jul/src/test/java/org/apache/logging/log4j/jul/test/CallerInformationTest.java
index 06ce2cf904..d5896cb1b3 100644
---
a/log4j-jul/src/test/java/org/apache/logging/log4j/jul/CallerInformationTest.java
+++
b/log4j-jul/src/test/java/org/apache/logging/log4j/jul/test/CallerInformationTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.logging.log4j.jul;
+package org.apache.logging.log4j.jul.test;
import static org.junit.Assert.*;
@@ -22,6 +22,7 @@ import java.util.List;
import java.util.logging.Logger;
import org.apache.logging.log4j.core.test.appender.ListAppender;
import org.apache.logging.log4j.core.test.junit.LoggerContextRule;
+import org.apache.logging.log4j.jul.LogManager;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Rule;
diff --git
a/log4j-jul/src/test/java/org/apache/logging/log4j/jul/CoreLoggerTest.java
b/log4j-jul/src/test/java/org/apache/logging/log4j/jul/test/CoreLoggerTest.java
similarity index 98%
rename from
log4j-jul/src/test/java/org/apache/logging/log4j/jul/CoreLoggerTest.java
rename to
log4j-jul/src/test/java/org/apache/logging/log4j/jul/test/CoreLoggerTest.java
index 904acbbf37..57d63b9372 100644
--- a/log4j-jul/src/test/java/org/apache/logging/log4j/jul/CoreLoggerTest.java
+++
b/log4j-jul/src/test/java/org/apache/logging/log4j/jul/test/CoreLoggerTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.logging.log4j.jul;
+package org.apache.logging.log4j.jul.test;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
@@ -24,6 +24,7 @@ import static org.junit.Assert.assertThat;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.logging.log4j.core.test.appender.ListAppender;
+import org.apache.logging.log4j.jul.LogManager;
import org.apache.logging.log4j.util.Strings;
import org.junit.After;
import org.junit.AfterClass;
diff --git
a/log4j-jul/src/test/java/org/apache/logging/log4j/jul/DefaultLevelConverterCustomJulLevelsTest.java
b/log4j-jul/src/test/java/org/apache/logging/log4j/jul/test/DefaultLevelConverterCustomJulLevelsTest.java
similarity index 97%
rename from
log4j-jul/src/test/java/org/apache/logging/log4j/jul/DefaultLevelConverterCustomJulLevelsTest.java
rename to
log4j-jul/src/test/java/org/apache/logging/log4j/jul/test/DefaultLevelConverterCustomJulLevelsTest.java
index 780bb18f13..14b6416eb7 100644
---
a/log4j-jul/src/test/java/org/apache/logging/log4j/jul/DefaultLevelConverterCustomJulLevelsTest.java
+++
b/log4j-jul/src/test/java/org/apache/logging/log4j/jul/test/DefaultLevelConverterCustomJulLevelsTest.java
@@ -14,9 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.logging.log4j.jul;
+package org.apache.logging.log4j.jul.test;
import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.jul.DefaultLevelConverter;
+import org.apache.logging.log4j.jul.LevelTranslator;
import org.junit.Assert;
import org.junit.Test;
diff --git
a/log4j-jul/src/test/java/org/apache/logging/log4j/jul/DefaultLevelConverterTest.java
b/log4j-jul/src/test/java/org/apache/logging/log4j/jul/test/DefaultLevelConverterTest.java
similarity index 91%
rename from
log4j-jul/src/test/java/org/apache/logging/log4j/jul/DefaultLevelConverterTest.java
rename to
log4j-jul/src/test/java/org/apache/logging/log4j/jul/test/DefaultLevelConverterTest.java
index 0afce7ae22..dc7d334fa6 100644
---
a/log4j-jul/src/test/java/org/apache/logging/log4j/jul/DefaultLevelConverterTest.java
+++
b/log4j-jul/src/test/java/org/apache/logging/log4j/jul/test/DefaultLevelConverterTest.java
@@ -14,8 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.logging.log4j.jul;
+package org.apache.logging.log4j.jul.test;
+import org.apache.logging.log4j.jul.DefaultLevelConverter;
import org.junit.Assert;
import org.junit.Test;
diff --git
a/log4j-jul/src/test/java/org/apache/logging/log4j/jul/JavaLevelTranslatorTest.java
b/log4j-jul/src/test/java/org/apache/logging/log4j/jul/test/JavaLevelTranslatorTest.java
similarity index 96%
rename from
log4j-jul/src/test/java/org/apache/logging/log4j/jul/JavaLevelTranslatorTest.java
rename to
log4j-jul/src/test/java/org/apache/logging/log4j/jul/test/JavaLevelTranslatorTest.java
index ea8a383d0d..45aa09c503 100644
---
a/log4j-jul/src/test/java/org/apache/logging/log4j/jul/JavaLevelTranslatorTest.java
+++
b/log4j-jul/src/test/java/org/apache/logging/log4j/jul/test/JavaLevelTranslatorTest.java
@@ -14,13 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.logging.log4j.jul;
+package org.apache.logging.log4j.jul.test;
import static org.junit.Assert.*;
import java.util.Arrays;
import java.util.Collection;
import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.jul.LevelTranslator;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
diff --git
a/log4j-jul/src/test/java/org/apache/logging/log4j/jul/Log4jBridgeHandlerTest.java
b/log4j-jul/src/test/java/org/apache/logging/log4j/jul/test/Log4jBridgeHandlerTest.java
similarity index 99%
rename from
log4j-jul/src/test/java/org/apache/logging/log4j/jul/Log4jBridgeHandlerTest.java
rename to
log4j-jul/src/test/java/org/apache/logging/log4j/jul/test/Log4jBridgeHandlerTest.java
index ed3acdafca..2859cca1a6 100644
---
a/log4j-jul/src/test/java/org/apache/logging/log4j/jul/Log4jBridgeHandlerTest.java
+++
b/log4j-jul/src/test/java/org/apache/logging/log4j/jul/test/Log4jBridgeHandlerTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.logging.log4j.jul;
+package org.apache.logging.log4j.jul.test;
// note: NO import of Logger, Level, LogManager to prevent conflicts JUL/log4j
import static org.junit.Assert.assertEquals;
diff --git
a/log4j-jul/src/test/java/org/apache/logging/log4j/jul/Log4jLevelTranslatorTest.java
b/log4j-jul/src/test/java/org/apache/logging/log4j/jul/test/Log4jLevelTranslatorTest.java
similarity index 96%
rename from
log4j-jul/src/test/java/org/apache/logging/log4j/jul/Log4jLevelTranslatorTest.java
rename to
log4j-jul/src/test/java/org/apache/logging/log4j/jul/test/Log4jLevelTranslatorTest.java
index 90c2e24d9b..2d2d8c2ca3 100644
---
a/log4j-jul/src/test/java/org/apache/logging/log4j/jul/Log4jLevelTranslatorTest.java
+++
b/log4j-jul/src/test/java/org/apache/logging/log4j/jul/test/Log4jLevelTranslatorTest.java
@@ -14,13 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.logging.log4j.jul;
+package org.apache.logging.log4j.jul.test;
import static org.junit.Assert.assertEquals;
import java.util.Arrays;
import java.util.Collection;
import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.jul.LevelTranslator;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
diff --git a/log4j-jul/src/test/resources/log4j2-julBridge-test.xml
b/log4j-jul/src/test/resources/log4j2-julBridge-test.xml
index c07ddad85a..18fb678c56 100644
--- a/log4j-jul/src/test/resources/log4j2-julBridge-test.xml
+++ b/log4j-jul/src/test/resources/log4j2-julBridge-test.xml
@@ -28,7 +28,7 @@
</Root>
<!-- needs to be set to a lower level: -->
- <Logger name="org.apache.logging.log4j.jul.Log4jBridgeHandlerTest"
level="TRACE" />
+ <Logger
name="org.apache.logging.log4j.jul.test.Log4jBridgeHandlerTest" level="TRACE" />
<!-- some test configs: -->
<Logger name="log4j.Log4jBridgeHandlerTest.propagate1" level="DEBUG" />
<Logger name="log4j.Log4jBridgeHandlerTest.propagate1.nested1"
level="TRACE" />
