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 133e82ce67 Fix spotless errors
133e82ce67 is described below
commit 133e82ce6716d1d4a336e8ddfdc410123ece9a1d
Author: Piotr P. Karwasz <[email protected]>
AuthorDate: Thu Mar 30 00:05:06 2023 +0200
Fix spotless errors
---
.../main/java/org/apache/log4j/WriterAppender.java | 11 +++----
.../org/apache/log4j/bridge/LayoutAdapter.java | 2 +-
.../org/apache/log4j/builders/AbstractBuilder.java | 6 ++--
.../builders/appender/AsyncAppenderBuilder.java | 14 ++++----
.../appender/DailyRollingFileAppenderBuilder.java | 14 ++++----
.../builders/appender/RewriteAppenderBuilder.java | 14 ++++----
.../appender/RollingFileAppenderBuilder.java | 14 ++++----
.../builders/filter/LevelMatchFilterBuilder.java | 6 ++--
.../org/apache/log4j/config/PropertySetter.java | 13 +++-----
.../org/apache/log4j/helpers/OptionConverter.java | 23 +++++++-------
.../java/org/apache/log4j/or/ObjectRenderer.java | 2 +-
.../main/java/org/apache/log4j/or/RendererMap.java | 37 +++++++++++-----------
.../main/java/org/apache/log4j/spi/ErrorCode.java | 11 +++----
.../java/org/apache/log4j/spi/LoggingEvent.java | 10 +++---
.../org/apache/log4j/xml/XmlConfiguration.java | 11 +++----
15 files changed, 90 insertions(+), 98 deletions(-)
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/WriterAppender.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/WriterAppender.java
index 760449c237..f99671096f 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/WriterAppender.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/WriterAppender.java
@@ -1,20 +1,19 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
+ * 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 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
+ * 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.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
*/
-
package org.apache.log4j;
import java.io.IOException;
diff --git
a/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/LayoutAdapter.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/LayoutAdapter.java
index a98b0a8646..2b9130b99a 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/LayoutAdapter.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/LayoutAdapter.java
@@ -34,7 +34,7 @@ public class LayoutAdapter implements
org.apache.logging.log4j.core.Layout<Strin
* the result of
* {@link LayoutWrapper#adapt(org.apache.logging.log4j.core.Layout)} should
* return the original Log4j 2.x layout.
- *
+ *
* @param layout a Log4j 1.x layout
* @return a Log4j 2.x layout or {@code null} if the parameter is {@code
null}
*/
diff --git
a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/AbstractBuilder.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/AbstractBuilder.java
index f2605ace91..6476a7f2da 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/AbstractBuilder.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/AbstractBuilder.java
@@ -16,9 +16,6 @@
*/
package org.apache.log4j.builders;
-import static org.apache.log4j.xml.XmlConfiguration.NAME_ATTR;
-import static org.apache.log4j.xml.XmlConfiguration.VALUE_ATTR;
-
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
@@ -38,6 +35,9 @@ import org.apache.logging.log4j.status.StatusLogger;
import org.apache.logging.log4j.util.Strings;
import org.w3c.dom.Element;
+import static org.apache.log4j.xml.XmlConfiguration.NAME_ATTR;
+import static org.apache.log4j.xml.XmlConfiguration.VALUE_ATTR;
+
/**
* Base class for Log4j 1 component builders.
*
diff --git
a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/AsyncAppenderBuilder.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/AsyncAppenderBuilder.java
index 51fdc14137..db4fe03f42 100644
---
a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/AsyncAppenderBuilder.java
+++
b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/AsyncAppenderBuilder.java
@@ -16,13 +16,6 @@
*/
package org.apache.log4j.builders.appender;
-import static org.apache.log4j.builders.BuilderManager.CATEGORY;
-import static org.apache.log4j.config.Log4j1Configuration.APPENDER_REF_TAG;
-import static org.apache.log4j.config.Log4j1Configuration.THRESHOLD_PARAM;
-import static org.apache.log4j.xml.XmlConfiguration.FILTER_TAG;
-import static org.apache.log4j.xml.XmlConfiguration.PARAM_TAG;
-import static org.apache.log4j.xml.XmlConfiguration.forEachElement;
-
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
@@ -49,6 +42,13 @@ import org.apache.logging.log4j.status.StatusLogger;
import org.apache.logging.log4j.util.Strings;
import org.w3c.dom.Element;
+import static org.apache.log4j.builders.BuilderManager.CATEGORY;
+import static org.apache.log4j.config.Log4j1Configuration.APPENDER_REF_TAG;
+import static org.apache.log4j.config.Log4j1Configuration.THRESHOLD_PARAM;
+import static org.apache.log4j.xml.XmlConfiguration.FILTER_TAG;
+import static org.apache.log4j.xml.XmlConfiguration.PARAM_TAG;
+import static org.apache.log4j.xml.XmlConfiguration.forEachElement;
+
/**
* Build an Async Appender
*/
diff --git
a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/DailyRollingFileAppenderBuilder.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/DailyRollingFileAppenderBuilder.java
index ada06424da..d27078af0c 100644
---
a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/DailyRollingFileAppenderBuilder.java
+++
b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/DailyRollingFileAppenderBuilder.java
@@ -16,13 +16,6 @@
*/
package org.apache.log4j.builders.appender;
-import static org.apache.log4j.builders.BuilderManager.CATEGORY;
-import static org.apache.log4j.config.Log4j1Configuration.THRESHOLD_PARAM;
-import static org.apache.log4j.xml.XmlConfiguration.FILTER_TAG;
-import static org.apache.log4j.xml.XmlConfiguration.LAYOUT_TAG;
-import static org.apache.log4j.xml.XmlConfiguration.PARAM_TAG;
-import static org.apache.log4j.xml.XmlConfiguration.forEachElement;
-
import java.util.Properties;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
@@ -49,6 +42,13 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.status.StatusLogger;
import org.w3c.dom.Element;
+import static org.apache.log4j.builders.BuilderManager.CATEGORY;
+import static org.apache.log4j.config.Log4j1Configuration.THRESHOLD_PARAM;
+import static org.apache.log4j.xml.XmlConfiguration.FILTER_TAG;
+import static org.apache.log4j.xml.XmlConfiguration.LAYOUT_TAG;
+import static org.apache.log4j.xml.XmlConfiguration.PARAM_TAG;
+import static org.apache.log4j.xml.XmlConfiguration.forEachElement;
+
/**
* Build a Daily Rolling File Appender
*/
diff --git
a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/RewriteAppenderBuilder.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/RewriteAppenderBuilder.java
index bcfcf86782..f18c25cf8d 100644
---
a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/RewriteAppenderBuilder.java
+++
b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/RewriteAppenderBuilder.java
@@ -16,13 +16,6 @@
*/
package org.apache.log4j.builders.appender;
-import static org.apache.log4j.builders.BuilderManager.CATEGORY;
-import static org.apache.log4j.config.Log4j1Configuration.APPENDER_REF_TAG;
-import static org.apache.log4j.config.Log4j1Configuration.THRESHOLD_PARAM;
-import static org.apache.log4j.xml.XmlConfiguration.FILTER_TAG;
-import static org.apache.log4j.xml.XmlConfiguration.PARAM_TAG;
-import static org.apache.log4j.xml.XmlConfiguration.forEachElement;
-
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
@@ -49,6 +42,13 @@ import org.apache.logging.log4j.status.StatusLogger;
import org.apache.logging.log4j.util.Strings;
import org.w3c.dom.Element;
+import static org.apache.log4j.builders.BuilderManager.CATEGORY;
+import static org.apache.log4j.config.Log4j1Configuration.APPENDER_REF_TAG;
+import static org.apache.log4j.config.Log4j1Configuration.THRESHOLD_PARAM;
+import static org.apache.log4j.xml.XmlConfiguration.FILTER_TAG;
+import static org.apache.log4j.xml.XmlConfiguration.PARAM_TAG;
+import static org.apache.log4j.xml.XmlConfiguration.forEachElement;
+
/**
* Build a Rewrite Appender
*/
diff --git
a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/RollingFileAppenderBuilder.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/RollingFileAppenderBuilder.java
index 2a9ee41731..53e899b688 100644
---
a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/RollingFileAppenderBuilder.java
+++
b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/RollingFileAppenderBuilder.java
@@ -16,13 +16,6 @@
*/
package org.apache.log4j.builders.appender;
-import static org.apache.log4j.builders.BuilderManager.CATEGORY;
-import static org.apache.log4j.config.Log4j1Configuration.THRESHOLD_PARAM;
-import static org.apache.log4j.xml.XmlConfiguration.FILTER_TAG;
-import static org.apache.log4j.xml.XmlConfiguration.LAYOUT_TAG;
-import static org.apache.log4j.xml.XmlConfiguration.PARAM_TAG;
-import static org.apache.log4j.xml.XmlConfiguration.forEachElement;
-
import java.util.Properties;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
@@ -48,6 +41,13 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.status.StatusLogger;
import org.w3c.dom.Element;
+import static org.apache.log4j.builders.BuilderManager.CATEGORY;
+import static org.apache.log4j.config.Log4j1Configuration.THRESHOLD_PARAM;
+import static org.apache.log4j.xml.XmlConfiguration.FILTER_TAG;
+import static org.apache.log4j.xml.XmlConfiguration.LAYOUT_TAG;
+import static org.apache.log4j.xml.XmlConfiguration.PARAM_TAG;
+import static org.apache.log4j.xml.XmlConfiguration.forEachElement;
+
/**
* Build a File Appender
*/
diff --git
a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/filter/LevelMatchFilterBuilder.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/filter/LevelMatchFilterBuilder.java
index e09c1c2de9..8d9ec4e4d0 100644
---
a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/filter/LevelMatchFilterBuilder.java
+++
b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/filter/LevelMatchFilterBuilder.java
@@ -16,9 +16,6 @@
*/
package org.apache.log4j.builders.filter;
-import static org.apache.log4j.builders.BuilderManager.CATEGORY;
-import static org.apache.log4j.xml.XmlConfiguration.forEachElement;
-
import java.util.Properties;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
@@ -34,6 +31,9 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.filter.LevelMatchFilter;
import org.w3c.dom.Element;
+import static org.apache.log4j.builders.BuilderManager.CATEGORY;
+import static org.apache.log4j.xml.XmlConfiguration.forEachElement;
+
/**
* Build a Level match filter.
*/
diff --git
a/log4j-1.2-api/src/main/java/org/apache/log4j/config/PropertySetter.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/config/PropertySetter.java
index 7ee650ef4c..696f198cb9 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/config/PropertySetter.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/config/PropertySetter.java
@@ -1,22 +1,19 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
+ * 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 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
+ * 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.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
*/
-
-// Contributors: Georg Lundesgaard
-
package org.apache.log4j.config;
import java.beans.BeanInfo;
diff --git
a/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/OptionConverter.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/OptionConverter.java
index a96282b061..ba6e4596bc 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/OptionConverter.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/OptionConverter.java
@@ -1,20 +1,19 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
+ * 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 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
+ * 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.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
*/
-
package org.apache.log4j.helpers;
import java.io.InputStream;
@@ -64,7 +63,7 @@ public class OptionConverter {
+ 100 * (StandardLevel.FATAL.intLevel() -
StandardLevel.OFF.intLevel() - 1) + 1;
/**
* A Log4j 1.x level below or equal to this value is considered as ALL.
- *
+ *
* Log4j 2.x ALL to TRACE interval is shorter. This is {@link
Priority#ALL_INT}
* plus the difference.
*/
@@ -540,12 +539,12 @@ public class OptionConverter {
* character is present, then the default {@link org.apache.log4j.Level}
class
* is used to process the level value.
* </p>
- *
+ *
* <p>
* As a special case, if the <code>value</code> parameter is equal to the
string
* "NULL", then the value <code>null</code> will be returned.
* </p>
- *
+ *
* <p>
* As a Log4j 2.x extension, a {@code value}
* "level#org.apache.logging.log4j.Level" retrieves the corresponding
custom
@@ -562,7 +561,7 @@ public class OptionConverter {
* Case of <code>value</code> is insignificant for the level, but is
* significant for the class name part, if present.
* </p>
- *
+ *
* @param value The value to convert.
* @param defaultValue The default value.
* @return the value of the result.
@@ -606,12 +605,12 @@ public class OptionConverter {
/**
* Converts a custom priority level to a Level object.
- *
+ *
* <p>
* If {@code clazz} has the special value "org.apache.logging.log4j.Level"
a
* wrapper of the corresponding Log4j 2.x custom level object is returned.
* </p>
- *
+ *
* @param clazz a custom level class,
* @param levelName the name of the level,
* @param defaultValue the value to return in case an error occurs,
diff --git
a/log4j-1.2-api/src/main/java/org/apache/log4j/or/ObjectRenderer.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/or/ObjectRenderer.java
index 4e627c24ac..7aa16deba9 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/or/ObjectRenderer.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/or/ObjectRenderer.java
@@ -25,5 +25,5 @@ public interface ObjectRenderer {
* @param o The object to render.
* @return The String representation of the object.
*/
- String doRender(Object o);
+ String doRender(Object o);
}
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/or/RendererMap.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/or/RendererMap.java
index c199a56f56..39a858669b 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/or/RendererMap.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/or/RendererMap.java
@@ -1,20 +1,19 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
+ * 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 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
- *
+ * 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.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
*/
-
package org.apache.log4j.or;
import java.util.Hashtable;
@@ -83,52 +82,52 @@ public class RendererMap {
/**
* Search the parents of <code>clazz</code> for a renderer. The renderer
closest in the hierarchy will be returned. If
* no renderers could be found, then the default renderer is returned.
- *
+ *
* <p>
* The search first looks for a renderer configured for
<code>clazz</code>. If a renderer could not be found, then the
* search continues by looking at all the interfaces implemented by
<code>clazz</code> including the super-interfaces of
* each interface. If a renderer cannot be found, then the search looks
for a renderer defined for the parent
* (superclass) of <code>clazz</code>. If that fails, then all the
interfaces implemented by the parent of
* <code>clazz</code> are searched and so on.
- *
+ *
* <p>
* For example, if A0, A1, A2 are classes and X0, X1, X2, Y0, Y1 are
interfaces where A2 extends A1 which in turn
* extends A0 and similarly X2 extends X1 which extends X0 and Y1 extends
Y0. Let us also assume that A1 implements the
* Y0 interface and that A2 implements the X2 interface.
- *
+ *
* <p>
* The table below shows the results returned by the
<code>get(A2.class)</code> method depending on the renderers added
* to the map.
- *
+ *
* <p>
* <table border="1">
* <tr>
* <th>Added renderers</th>
* <th>Value returned by <code>get(A2.class)</code></th>
- *
+ *
* <tr>
* <td><code>A0Renderer</code>
* <td align="center"><code>A0Renderer</code>
- *
+ *
* <tr>
* <td><code>A0Renderer, A1Renderer</code>
* <td align="center"><code>A1Renderer</code>
- *
+ *
* <tr>
* <td><code>X0Renderer</code>
* <td align="center"><code>X0Renderer</code>
- *
+ *
* <tr>
* <td><code>A1Renderer, X0Renderer</code>
* <td align="center"><code>X0Renderer</code>
- *
+ *
* </table>
- *
+ *
* <p>
* This search algorithm is not the most natural, although it is
particularly easy to implement. Future log4j versions
* <em>may</em> implement a more intuitive search algorithm. However, the
present algorithm should be acceptable in the
* vast majority of circumstances.
- *
+ *
*/
public ObjectRenderer get(Class clazz) {
// System.out.println("\nget: "+clazz);
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/spi/ErrorCode.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/spi/ErrorCode.java
index 752b077a84..c734701dc2 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/spi/ErrorCode.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/spi/ErrorCode.java
@@ -1,20 +1,19 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
+ * 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 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
+ * 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.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
*/
-
package org.apache.log4j.spi;
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/spi/LoggingEvent.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/spi/LoggingEvent.java
index 73dd528efc..b68d6386e0 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/spi/LoggingEvent.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/spi/LoggingEvent.java
@@ -53,7 +53,7 @@ public class LoggingEvent {
/**
* Create new instance.
- *
+ *
* @since 1.2.15
* @param fqnOfCategoryClass Fully qualified class name of Logger
implementation.
* @param logger The logger generating this event.
@@ -73,11 +73,11 @@ public class LoggingEvent {
/**
* Instantiate a LoggingEvent from the supplied parameters.
- *
+ *
* <p>
* Except {@link #timeStamp} all the other fields of
<code>LoggingEvent</code> are filled when actually needed.
* <p>
- *
+ *
* @param logger The logger generating this event.
* @param timeStamp the timestamp of this logging event
* @param level The level of this event.
@@ -90,11 +90,11 @@ public class LoggingEvent {
/**
* Instantiate a LoggingEvent from the supplied parameters.
- *
+ *
* <p>
* Except {@link #timeStamp} all the other fields of
<code>LoggingEvent</code> are filled when actually needed.
* <p>
- *
+ *
* @param logger The logger generating this event.
* @param level The level of this event.
* @param message The message of this event.
diff --git
a/log4j-1.2-api/src/main/java/org/apache/log4j/xml/XmlConfiguration.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/xml/XmlConfiguration.java
index d8fee4d987..c02e714b5a 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/xml/XmlConfiguration.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/xml/XmlConfiguration.java
@@ -25,7 +25,6 @@ import java.util.Properties;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Consumer;
import java.util.stream.IntStream;
-
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.FactoryConfigurationError;
@@ -43,9 +42,9 @@ import org.apache.log4j.rewrite.RewritePolicy;
import org.apache.log4j.spi.AppenderAttachable;
import org.apache.log4j.spi.ErrorHandler;
import org.apache.log4j.spi.Filter;
+import org.apache.logging.log4j.core.Filter.Result;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.appender.rolling.TriggeringPolicy;
-import org.apache.logging.log4j.core.Filter.Result;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.ConfigurationSource;
import org.apache.logging.log4j.core.config.LoggerConfig;
@@ -653,8 +652,8 @@ public class XmlConfiguration extends Log4j1Configuration {
return layout;
} catch (Exception e) {
Throwable cause = e.getCause();
- if (e instanceof InterruptedException
- || e instanceof InterruptedIOException
+ if (e instanceof InterruptedException
+ || e instanceof InterruptedIOException
|| cause instanceof InterruptedException
|| cause instanceof InterruptedIOException) {
Thread.currentThread().interrupt();
@@ -758,7 +757,7 @@ public class XmlConfiguration extends Log4j1Configuration {
forEachElement(element.getChildNodes(), currentElement -> {
switch (currentElement.getTagName()) {
- case CATEGORY:
+ case CATEGORY:
case LOGGER_ELEMENT:
parseCategory(currentElement);
break;
@@ -771,7 +770,7 @@ public class XmlConfiguration extends Log4j1Configuration {
case THROWABLE_RENDERER_TAG:
LOGGER.warn("Log4j 1 throwable renderers are not supported
by Log4j 2 and will be ignored.");
break;
- case CATEGORY_FACTORY_TAG:
+ case CATEGORY_FACTORY_TAG:
case LOGGER_FACTORY_TAG:
LOGGER.warn("Log4j 1 logger factories are not supported by
Log4j 2 and will be ignored.");
break;
