This is an automated email from the ASF dual-hosted git repository. rgoers pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 1ea13537f17563b773f61b17f52ec58282cd9b48 Author: jiangtangbi <[email protected]> AuthorDate: Mon Apr 20 14:02:39 2020 +0800 follow the codestyle --- .../logging/log4j/core/layout/GelfLayoutTest.java | 77 ++++++++++------------ 1 file changed, 36 insertions(+), 41 deletions(-) diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/GelfLayoutTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/GelfLayoutTest.java index 15bdf39..8b8736f 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/GelfLayoutTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/GelfLayoutTest.java @@ -20,11 +20,7 @@ import com.fasterxml.jackson.core.io.JsonStringEncoder; import org.apache.commons.io.IOUtils; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.ThreadContext; -import org.apache.logging.log4j.core.Appender; -import org.apache.logging.log4j.core.BasicConfigurationFactory; -import org.apache.logging.log4j.core.LogEvent; -import org.apache.logging.log4j.core.Logger; -import org.apache.logging.log4j.core.LoggerContext; +import org.apache.logging.log4j.core.*; import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.core.layout.GelfLayout.CompressionType; import org.apache.logging.log4j.core.lookup.JavaLookup; @@ -90,17 +86,17 @@ public class GelfLayoutTest { } // set up appenders final GelfLayout layout = GelfLayout.newBuilder() - .setConfiguration(ctx.getConfiguration()) - .setHost(host) - .setAdditionalFields(new KeyValuePair[]{ - new KeyValuePair(KEY1, VALUE1), - new KeyValuePair(KEY2, "${java:runtime}"),}) - .setCompressionType(compressionType) - .setCompressionThreshold(1024) - .setIncludeStacktrace(includeStacktrace) - .setIncludeThreadContext(includeThreadContext) - .setIncludeNullDelimiter(includeNullDelimiter) - .build(); + .setConfiguration(ctx.getConfiguration()) + .setHost(host) + .setAdditionalFields(new KeyValuePair[] { + new KeyValuePair(KEY1, VALUE1), + new KeyValuePair(KEY2, "${java:runtime}"), }) + .setCompressionType(compressionType) + .setCompressionThreshold(1024) + .setIncludeStacktrace(includeStacktrace) + .setIncludeThreadContext(includeThreadContext) + .setIncludeNullDelimiter(includeNullDelimiter) + .build(); final ListAppender eventAppender = new ListAppender("Events", null, null, true, false); final ListAppender rawAppender = new ListAppender("Raw", null, layout, true, true); final ListAppender formattedAppender = new ListAppender("Formatted", null, layout, true, false); @@ -163,11 +159,11 @@ public class GelfLayoutTest { "\"_thread\": \"" + threadName + "\"," + "\"_logger\": \"\"," + "\"short_message\": \"" + LINE2 + "\"," + - (includeThreadContext ? - "\"_" + MDCKEY1 + "\": \"" + MDCVALUE1 + "\"," + - "\"_" + MDCKEY2 + "\": \"" + MDCVALUE2 + "\"," - : - "") + + (includeThreadContext ? + "\"_" + MDCKEY1 + "\": \"" + MDCVALUE1 + "\"," + + "\"_" + MDCKEY2 + "\": \"" + MDCVALUE2 + "\"," + : + "") + "\"_" + KEY1 + "\": \"" + VALUE1 + "\"," + "\"_" + KEY2 + "\": \"" + javaLookup.getRuntime() + "\"" + "}", @@ -180,20 +176,20 @@ public class GelfLayoutTest { InputStream inflaterStream; InputStream inflaterStream2; switch (compressionType) { - case GZIP: - inflaterStream = new GZIPInputStream(bais); - inflaterStream2 = new GZIPInputStream(bais2); - break; - case ZLIB: - inflaterStream = new InflaterInputStream(bais); - inflaterStream2 = new InflaterInputStream(bais2); - break; - case OFF: - inflaterStream = bais; - inflaterStream2 = bais2; - break; - default: - throw new IllegalStateException("Missing test case clause"); + case GZIP: + inflaterStream = new GZIPInputStream(bais); + inflaterStream2 = new GZIPInputStream(bais2); + break; + case ZLIB: + inflaterStream = new InflaterInputStream(bais); + inflaterStream2 = new InflaterInputStream(bais2); + break; + case OFF: + inflaterStream = bais; + inflaterStream2 = bais2; + break; + default: + throw new IllegalStateException("Missing test case clause"); } final byte[] uncompressed = IOUtils.toByteArray(inflaterStream); final byte[] uncompressed2 = IOUtils.toByteArray(inflaterStream2); @@ -213,9 +209,9 @@ public class GelfLayoutTest { "\"full_message\": \"" + String.valueOf(JsonStringEncoder.getInstance().quoteAsString( includeStacktrace ? GelfLayout.formatThrowable(exception).toString() : exception.toString())) + "\"," + (includeThreadContext ? - "\"_" + MDCKEY1 + "\": \"" + MDCVALUE1 + "\"," + - "\"_" + MDCKEY2 + "\": \"" + MDCVALUE2 + "\"," - : "") + + "\"_" + MDCKEY1 + "\": \"" + MDCVALUE1 + "\"," + + "\"_" + MDCKEY2 + "\": \"" + MDCVALUE2 + "\"," + : "") + "\"_" + KEY1 + "\": \"" + VALUE1 + "\"," + "\"_" + KEY2 + "\": \"" + javaLookup.getRuntime() + "\"" + "}"; @@ -271,10 +267,9 @@ public class GelfLayoutTest { } private void testRequiresLocation(String messagePattern, Boolean requiresLocation) { - GelfLayout layout = GelfLayout.newBuilder() - .setMessagePattern(messagePattern) - .build(); + .setMessagePattern(messagePattern) + .build(); assertEquals(layout.requiresLocation(), requiresLocation); }
