fix: spotless formatting

Author: ninetteadhikari

log4j-1.2-api/src/test/java/org/apache/log4j/CallerInformationTest.java

@@ -20,8 +20,8 @@
 
 import java.util.List;
 import org.apache.logging.log4j.core.test.appender.ListAppender;
-import org.apache.logging.log4j.core.test.junit.Named;
 import org.apache.logging.log4j.core.test.junit.LoggerContextSource;
+import org.apache.logging.log4j.core.test.junit.Named;
 import org.junit.jupiter.api.Test;
 
 // config from log4j-core test-jar

log4j-1.2-api/src/test/java/org/apache/log4j/CategoryTest.java

@@ -44,8 +44,8 @@
 import org.apache.logging.log4j.util.Constants;
 import org.apache.logging.log4j.util.Strings;
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -346,17 +346,11 @@ public void testAddAppender() {
             logger.addAppender(appender);
             // Root logger
             rootLogger.info("testAddLogger");
-            assertEquals(
-                    ++count,
-                    version1Appender.getEvents().size(),
-                    "adding at root works");
+            assertEquals(++count, version1Appender.getEvents().size(), "adding at root works");
             assertEquals(0, appender.getEvents().size(), "adding at child works");
             // Another logger
             logger.info("testAddLogger2");
-            assertEquals(
-                    ++count,
-                    version1Appender.getEvents().size(),
-                    "adding at root works");
+            assertEquals(++count, version1Appender.getEvents().size(), "adding at root works");
             assertEquals(1, appender.getEvents().size(), "adding at child works");
             // Call appenders
             final LoggingEvent event = new LoggingEvent();

log4j-1.2-api/src/test/java/org/apache/log4j/LoggerTest.java

@@ -16,11 +16,10 @@
  */
 package org.apache.log4j;
 
-import static org.hamcrest.Matchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
+import static org.hamcrest.Matchers.nullValue;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -40,8 +39,8 @@
 import org.apache.logging.log4j.core.layout.PatternLayout;
 import org.apache.logging.log4j.core.test.appender.ListAppender;
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 /**

log4j-1.2-api/src/test/java/org/apache/log4j/LoggingTest.java

@@ -19,7 +19,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-import org.apache.logging.log4j.core.test.junit.LoggerContextSource;;
+import org.apache.logging.log4j.core.test.junit.LoggerContextSource;
 import org.junit.jupiter.api.Test;
 
 /**

log4j-1.2-api/src/test/java/org/apache/log4j/MDCTestCase.java

@@ -18,8 +18,8 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class MDCTestCase {

log4j-1.2-api/src/test/java/org/apache/log4j/NDCTest.java

@@ -16,9 +16,10 @@
  */
 package org.apache.log4j;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.util.Stack;
 import org.apache.logging.log4j.util.Strings;
-import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.junit.jupiter.api.Test;
 
 public class NDCTest {

log4j-1.2-api/src/test/java/org/apache/log4j/PropertyConfiguratorTest.java

@@ -17,12 +17,11 @@
 package org.apache.log4j;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.nullValue;
-import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
-
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.nullValue;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNull;

log4j-1.2-api/src/test/java/org/apache/log4j/config/AbstractLog4j1ConfigurationConverterTest.java

@@ -29,13 +29,12 @@
 import java.util.List;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
+import org.xml.sax.SAXException;
 // import org.junit.jupiter.params.ParameterizedTest;
 // import org.junit.jupiter.params.provider.MethodSource;
-import org.junit.jupiter.api.Test;
 
 // import org.junit.runner.RunWith;
 // import org.junit.runners.Parameterized;
-import org.xml.sax.SAXException;
 
 public abstract class AbstractLog4j1ConfigurationConverterTest {
 

log4j-1.2-api/src/test/java/org/apache/log4j/config/AbstractLog4j1ConfigurationTest.java

@@ -67,10 +67,8 @@
 import org.apache.logging.log4j.core.layout.HtmlLayout;
 import org.apache.logging.log4j.core.layout.PatternLayout;
 import org.apache.logging.log4j.core.util.CloseShieldOutputStream;
-import org.junit.jupiter.api.io.TempDir;
-
 import org.junit.jupiter.api.Test;
-
+import org.junit.jupiter.api.io.TempDir;
 
 public abstract class AbstractLog4j1ConfigurationTest {
 
@@ -104,10 +102,7 @@ public void testConsoleCapitalization() throws Exception {
     private void testConsoleAppender(final ConsoleAppender expected, final ConsoleAppender actual) {
         assertEquals(expected.getImmediateFlush(), actual.getImmediateFlush(), "immediateFlush");
         assertEquals(expected.getTarget(), actual.getTarget(), "target");
-        assertEquals(
-                expected.getLayout().getClass(),
-                actual.getLayout().getClass(),
-                "layoutClass");
+        assertEquals(expected.getLayout().getClass(), actual.getLayout().getClass(), "layoutClass");
         if (expected.getLayout() instanceof PatternLayout) {
             patternLayoutEquals((PatternLayout) expected.getLayout(), (PatternLayout) actual.getLayout());
         }
@@ -217,16 +212,17 @@ private void testRollingFileAppender(final String configResource, final String n
 
         assertTrue(
                 rfa.getManager().getRolloverStrategy() instanceof DefaultRolloverStrategy, "defaultRolloverStrategy");
-        assertFalse(
-                ((DefaultRolloverStrategy) rfa.getManager().getRolloverStrategy()).isUseMax(), "rolloverStrategy");
+        assertFalse(((DefaultRolloverStrategy) rfa.getManager().getRolloverStrategy()).isUseMax(), "rolloverStrategy");
         assertEquals(false, getAppendProperty(rfa), "append");
         assertEquals(1000, rfa.getManager().getBufferSize(), "bufferSize");
         assertEquals(false, rfa.getImmediateFlush(), "immediateFlush");
         assertEquals("target/hadoop.log", rfa.getFileName());
         assertEquals(filePattern, rfa.getFilePattern());
         final TriggeringPolicy triggeringPolicy = rfa.getTriggeringPolicy();
         assertNotNull(triggeringPolicy);
-        assertTrue(triggeringPolicy instanceof CompositeTriggeringPolicy, triggeringPolicy.getClass().getName());
+        assertTrue(
+                triggeringPolicy instanceof CompositeTriggeringPolicy,
+                triggeringPolicy.getClass().getName());
         final CompositeTriggeringPolicy ctp = (CompositeTriggeringPolicy) triggeringPolicy;
         final TriggeringPolicy[] triggeringPolicies = ctp.getTriggeringPolicies();
         assertEquals(1, triggeringPolicies.length);
@@ -235,7 +231,9 @@ private void testRollingFileAppender(final String configResource, final String n
         final SizeBasedTriggeringPolicy sbtp = (SizeBasedTriggeringPolicy) tp;
         assertEquals(256 * 1024 * 1024, sbtp.getMaxFileSize());
         final RolloverStrategy rolloverStrategy = rfa.getManager().getRolloverStrategy();
-        assertTrue(rolloverStrategy instanceof DefaultRolloverStrategy, rolloverStrategy.getClass().getName());
+        assertTrue(
+                rolloverStrategy instanceof DefaultRolloverStrategy,
+                rolloverStrategy.getClass().getName());
         final DefaultRolloverStrategy drs = (DefaultRolloverStrategy) rolloverStrategy;
         assertEquals(20, drs.getMaxIndex());
         configuration.start();
@@ -249,7 +247,8 @@ private void testDailyRollingFileAppender(final String configResource, final Str
             final Appender appender = configuration.getAppender(name);
             assertNotNull(appender);
             assertEquals(name, appender.getName());
-            assertTrue(appender instanceof RollingFileAppender, appender.getClass().getName());
+            assertTrue(
+                    appender instanceof RollingFileAppender, appender.getClass().getName());
             final RollingFileAppender rfa = (RollingFileAppender) appender;
             assertEquals(false, getAppendProperty(rfa), "append");
             assertEquals(1000, rfa.getManager().getBufferSize(), "bufferSize");
@@ -258,7 +257,9 @@ private void testDailyRollingFileAppender(final String configResource, final Str
             assertEquals(filePattern, rfa.getFilePattern());
             final TriggeringPolicy triggeringPolicy = rfa.getTriggeringPolicy();
             assertNotNull(triggeringPolicy);
-            assertTrue(triggeringPolicy instanceof CompositeTriggeringPolicy, triggeringPolicy.getClass().getName());
+            assertTrue(
+                    triggeringPolicy instanceof CompositeTriggeringPolicy,
+                    triggeringPolicy.getClass().getName());
             final CompositeTriggeringPolicy ctp = (CompositeTriggeringPolicy) triggeringPolicy;
             final TriggeringPolicy[] triggeringPolicies = ctp.getTriggeringPolicies();
             assertEquals(1, triggeringPolicies.length);
@@ -267,7 +268,9 @@ private void testDailyRollingFileAppender(final String configResource, final Str
             final TimeBasedTriggeringPolicy tbtp = (TimeBasedTriggeringPolicy) tp;
             assertEquals(1, tbtp.getInterval());
             final RolloverStrategy rolloverStrategy = rfa.getManager().getRolloverStrategy();
-            assertTrue(rolloverStrategy instanceof DefaultRolloverStrategy, rolloverStrategy.getClass().getName());
+            assertTrue(
+                    rolloverStrategy instanceof DefaultRolloverStrategy,
+                    rolloverStrategy.getClass().getName());
             final DefaultRolloverStrategy drs = (DefaultRolloverStrategy) rolloverStrategy;
             assertEquals(Integer.MAX_VALUE, drs.getMaxIndex());
         } finally {
@@ -394,8 +397,7 @@ public void testDefaultValues() throws Exception {
         assertNotNull(ttccLayout);
         assertEquals(
                 "%r [%t] %p %c %notEmpty{%ndc }- %m%n",
-                ttccLayout.getConversionPattern(),
-                "equivalent conversion pattern");
+                ttccLayout.getConversionPattern(), "equivalent conversion pattern");
         // TODO: XMLLayout
         // final XmlLayout xmlLayout = (XmlLayout) testLayout(config, "XMLLayout");
         // assertNotNull(xmlLayout);
@@ -410,8 +412,7 @@ public void testDefaultValues() throws Exception {
         assertNotNull(dailyRollingFileAppender);
         assertEquals(
                 "target/dailyRollingFileAppender%d{.yyyy-MM-dd}",
-                dailyRollingFileAppender.getFilePattern(),
-                "equivalent file pattern");
+                dailyRollingFileAppender.getFilePattern(), "equivalent file pattern");
         assertEquals(true, getAppendProperty(dailyRollingFileAppender), "append");
         assertEquals(8192, dailyRollingFileAppender.getManager().getBufferSize(), "bufferSize");
         assertEquals(true, dailyRollingFileAppender.getImmediateFlush(), "immediateFlush");
@@ -546,8 +547,10 @@ public void testMultipleFilters() throws Exception {
             logger.warn("ACCEPT message");
             expected++;
             System.out.println("#############expected" + expected);
-            System.out.println("#############legacyAppender.getEvents().size()" +legacyAppender.getEvents().size());
-            System.out.println("#############nativeAppender.getEvents().size()" +nativeAppender.getEvents().size());
+            System.out.println("#############legacyAppender.getEvents().size()"
+                    + legacyAppender.getEvents().size());
+            System.out.println("#############nativeAppender.getEvents().size()"
+                    + nativeAppender.getEvents().size());
             assertEquals(expected, legacyAppender.getEvents().size());
             assertEquals(expected, nativeAppender.getEvents().size());
             // message blocked by "StartsWith" filter
@@ -601,8 +604,7 @@ protected void testEnhancedRollingFileAppender(final Configuration configuration
         assertEquals("target/EnhancedRollingFileAppender/defaultTime.log", defaultTime.getFileName(), "fileName");
         assertEquals(
                 "target/EnhancedRollingFileAppender/defaultTime.%d{yyyy-MM-dd}.log",
-                defaultTime.getFilePattern(),
-                "filePattern");
+                defaultTime.getFilePattern(), "filePattern");
         policy = defaultTime.getTriggeringPolicy();
         assertTrue(policy instanceof TimeBasedTriggeringPolicy, "is TimeBasedTriggeringPolicy");
         // Size policy with default attributes

log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationConverterSparkTest.java

@@ -36,7 +36,7 @@ public Log4j1ConfigurationConverterSparkTest(final Path path) {
         super(path);
     }
 
-     // ParameterizedTest replacing the JUnit 4 @Test in abstract class
+    // ParameterizedTest replacing the JUnit 4 @Test in abstract class
     @ParameterizedTest
     @MethodSource("data")
     // @Override