You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by vy...@apache.org on 2023/11/22 15:18:24 UTC
(logging-log4j2) 01/02: Remove `JsonTemplateLayout.createDefaultLayout()`
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch module-deletion
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit d86d82bf591a787505e7457e10d805c4482e6143
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Wed Nov 22 16:17:08 2023 +0100
Remove `JsonTemplateLayout.createDefaultLayout()`
---
.../log4j/core/appender/HttpAppenderTest.java | 25 +++++++++++++---------
.../layout/template/json/JsonTemplateLayout.java | 6 ------
2 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/HttpAppenderTest.java b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/HttpAppenderTest.java
index 3c5ae8a118..0d553c9de5 100644
--- a/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/HttpAppenderTest.java
+++ b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/HttpAppenderTest.java
@@ -47,9 +47,7 @@ import org.apache.logging.log4j.message.SimpleMessage;
import org.apache.logging.log4j.status.StatusData;
import org.apache.logging.log4j.status.StatusListener;
import org.apache.logging.log4j.status.StatusLogger;
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.*;
@Ignore("Fails often on Windows")
@@ -160,13 +158,20 @@ public class HttpAppenderTest {
.keyManagerPassword(String.valueOf(TestConstants.KEYSTORE_PWD()))
.keystoreType(TestConstants.KEYSTORE_TYPE));
+ private JsonTemplateLayout layout;
+
+ @Before
+ public void initLayout() {
+ layout = JsonTemplateLayout.newBuilder().setConfiguration(ctx.getConfiguration()).build();
+ }
+
@Test
public void testAppend() throws Exception {
wireMockRule.stubFor(post(urlEqualTo("/test/log4j/")).willReturn(SUCCESS_RESPONSE));
final Appender appender = HttpAppender.newBuilder()
.setName("Http")
- .setLayout(JsonTemplateLayout.createDefaultLayout())
+ .setLayout(layout)
.setConfiguration(ctx.getConfiguration())
.setUrl(new URL("http://localhost:" + wireMockRule.port() + "/test/log4j/"))
.build();
@@ -184,7 +189,7 @@ public class HttpAppenderTest {
final Appender appender = HttpAppender.newBuilder()
.setName("Http")
- .setLayout(JsonTemplateLayout.createDefaultLayout())
+ .setLayout(layout)
.setConfiguration(ctx.getConfiguration())
.setUrl(new URL("https://localhost:" + wireMockRule.httpsPort() + "/test/log4j/"))
.setSslConfiguration(SslConfiguration.createSSLConfiguration(
@@ -219,7 +224,7 @@ public class HttpAppenderTest {
final Appender appender = HttpAppender.newBuilder()
.setName("Http")
- .setLayout(JsonTemplateLayout.createDefaultLayout())
+ .setLayout(layout)
.setConfiguration(ctx.getConfiguration())
.setMethod("PUT")
.setUrl(new URL("http://localhost:" + wireMockRule.port() + "/test/log4j/1234"))
@@ -238,7 +243,7 @@ public class HttpAppenderTest {
final Appender appender = HttpAppender.newBuilder()
.setName("Http")
- .setLayout(JsonTemplateLayout.createDefaultLayout())
+ .setLayout(layout)
.setConfiguration(ctx.getConfiguration())
.setUrl(new URL("http://localhost:" + wireMockRule.port() + "/test/log4j/"))
.setHeaders(new Property[] {
@@ -281,7 +286,7 @@ public class HttpAppenderTest {
final Appender appender = HttpAppender.newBuilder()
.setName("Http")
- .setLayout(JsonTemplateLayout.createDefaultLayout())
+ .setLayout(layout)
.setConfiguration(ctx.getConfiguration())
.setUrl(new URL("http://localhost:" + wireMockRule.port() + "/test/log4j/"))
.build();
@@ -304,7 +309,7 @@ public class HttpAppenderTest {
final Appender appender = HttpAppender.newBuilder()
.setName("Http")
- .setLayout(JsonTemplateLayout.createDefaultLayout())
+ .setLayout(layout)
.setConfiguration(ctx.getConfiguration())
.setIgnoreExceptions(false)
.setUrl(new URL("http://localhost:" + wireMockRule.port() + "/test/log4j/"))
@@ -316,7 +321,7 @@ public class HttpAppenderTest {
public void testAppendConnectError() throws Exception {
final Appender appender = HttpAppender.newBuilder()
.setName("Http")
- .setLayout(JsonTemplateLayout.createDefaultLayout())
+ .setLayout(layout)
.setConfiguration(ctx.getConfiguration())
.setIgnoreExceptions(false)
.setUrl(new URL("http://localhost:" + (wireMockRule.port() + 1) + "/test/log4j/"))
diff --git a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayout.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayout.java
index 692bd70452..30a668b311 100644
--- a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayout.java
+++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayout.java
@@ -25,7 +25,6 @@ import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.StringLayout;
import org.apache.logging.log4j.core.config.Configuration;
-import org.apache.logging.log4j.core.config.DefaultConfiguration;
import org.apache.logging.log4j.core.config.plugins.PluginConfiguration;
import org.apache.logging.log4j.core.layout.ByteBufferDestination;
import org.apache.logging.log4j.core.layout.Encoder;
@@ -250,11 +249,6 @@ public class JsonTemplateLayout implements StringLayout {
return CONTENT_FORMAT;
}
- public static JsonTemplateLayout createDefaultLayout() {
- final DefaultConfiguration configuration = new DefaultConfiguration();
- return JsonTemplateLayout.newBuilder().setConfiguration(configuration).build();
- }
-
@Factory
@SuppressWarnings("WeakerAccess")
public static Builder newBuilder() {