You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by pk...@apache.org on 2023/01/26 04:46:27 UTC
[logging-log4j2] 03/03: Add changelog and test to `DefaultLogBuilder`
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit ec35f53f3f3fe860319b345d5147a991929c43fe
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Wed Jan 25 22:07:11 2023 +0100
Add changelog and test to `DefaultLogBuilder`
---
.../log4j/internal/DefaultLogBuilderTest.java | 49 ++++++++++++++++++++++
.../.2.x.x/LOG4J2-3615_Fix_OSGI_API_leak.xml | 24 +++++++++++
2 files changed, 73 insertions(+)
diff --git a/log4j-api-test/src/test/java/org/apache/logging/log4j/internal/DefaultLogBuilderTest.java b/log4j-api-test/src/test/java/org/apache/logging/log4j/internal/DefaultLogBuilderTest.java
new file mode 100644
index 0000000000..1a6a404d82
--- /dev/null
+++ b/log4j-api-test/src/test/java/org/apache/logging/log4j/internal/DefaultLogBuilderTest.java
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * 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
+ *
+ * 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.
+ */
+package org.apache.logging.log4j.internal;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.logging.log4j.LogBuilder;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.test.TestLogger;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class DefaultLogBuilderTest {
+
+ private final TestLogger logger1 = (TestLogger) LogManager.getLogger(DefaultLogBuilderTest.class);
+ private final TestLogger logger2 = (TestLogger) LogManager.getLogger("second.logger");
+
+ @Test
+ public void testConcurrentUsage() {
+ logger1.getEntries().clear();
+ logger2.getEntries().clear();
+ final List<LogBuilder> logBuilders = Arrays.asList(
+ logger1.atDebug(),
+ logger1.atInfo(),
+ logger2.atDebug(),
+ logger2.atInfo());
+ logBuilders.forEach(logBuilder -> logBuilder.log("Hello LogBuilder!"));
+ assertThat(logger1.getEntries()).hasSize(2)
+ .containsExactly(" DEBUG Hello LogBuilder!", " INFO Hello LogBuilder!");
+ assertThat(logger2.getEntries()).hasSize(2)
+ .containsExactly(" DEBUG Hello LogBuilder!", " INFO Hello LogBuilder!");
+ }
+}
diff --git a/src/changelog/.2.x.x/LOG4J2-3615_Fix_OSGI_API_leak.xml b/src/changelog/.2.x.x/LOG4J2-3615_Fix_OSGI_API_leak.xml
new file mode 100644
index 0000000000..b0706f0cb6
--- /dev/null
+++ b/src/changelog/.2.x.x/LOG4J2-3615_Fix_OSGI_API_leak.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ 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
+
+ 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.
+-->
+<entry type="added">
+ <issue id="LOG4J2-3615" link="https://issues.apache.org/jira/browse/LOG4J2-3615"/>
+ <author id="pkarwasz"/>
+ <description format="asciidoc">
+ Removes internal field that leaked into public API.
+ </description>
+</entry>