You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2020/11/16 15:04:36 UTC
[logging-log4j2] branch release-2.x updated (06101a9 -> 15f5da3)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git.
from 06101a9 LOG4J2-2961 Fix reading of JsonTemplateLayout event additional fields from config.
new 1caecb8 No need to nest else clauses.
new 2dd6eca Add missing @Override.
new b8b3778 Remove trailing whitespace.
new 15f5da3 Use Java 7 diamond.
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/java/org/apache/log4j/Category.java | 13 ++--
.../src/main/java/org/apache/log4j/MDC.java | 2 +-
.../main/java/org/apache/log4j/WriterAppender.java | 5 ++
.../org/apache/log4j/bridge/LogEventAdapter.java | 3 +-
.../org/apache/log4j/builders/AbstractBuilder.java | 3 +-
.../org/apache/log4j/builders/BuilderManager.java | 7 +--
.../log4j/config/Log4j1ConfigurationParser.java | 2 +-
.../log4j/config/PropertiesConfiguration.java | 2 +
.../org/apache/log4j/helpers/OptionConverter.java | 70 ++++++++++------------
.../java/org/apache/log4j/helpers/QuietWriter.java | 5 +-
.../org/apache/log4j/or/ThreadGroupRenderer.java | 14 ++---
.../org/apache/log4j/or/jms/MessageRenderer.java | 6 +-
.../org/apache/log4j/rewrite/MapRewritePolicy.java | 4 +-
.../log4j/rewrite/PropertyRewritePolicy.java | 1 +
.../main/java/org/apache/log4j/spi/ErrorCode.java | 4 +-
.../org/apache/log4j/xml/Log4jEntityResolver.java | 4 +-
.../org/apache/log4j/xml/XmlConfiguration.java | 52 ++++++++--------
.../test/java/org/apache/log4j/CategoryTest.java | 2 +-
.../test/java/org/apache/log4j/MDCTestCase.java | 4 +-
.../test/java/org/apache/log4j/VelocityTest.java | 6 +-
20 files changed, 105 insertions(+), 104 deletions(-)
[logging-log4j2] 04/04: Use Java 7 diamond.
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 15f5da300cb6e4d672863867ca7b6555dddb978b
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Nov 16 10:04:29 2020 -0500
Use Java 7 diamond.
---
log4j-1.2-api/src/main/java/org/apache/log4j/MDC.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/MDC.java b/log4j-1.2-api/src/main/java/org/apache/log4j/MDC.java
index ee7631a..1012d29 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/MDC.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/MDC.java
@@ -38,7 +38,7 @@ public final class MDC {
@Override
protected Map<String, Object> childValue(final Map<String, Object> parentValue) {
- return parentValue == null ? new HashMap<String, Object>() : new HashMap<>(parentValue);
+ return parentValue == null ? new HashMap<>() : new HashMap<>(parentValue);
}
};
[logging-log4j2] 01/04: No need to nest else clauses.
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 1caecb8f379dc6b14079a5926f6c4f2bb77ede7c
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Nov 16 09:55:25 2020 -0500
No need to nest else clauses.
---
.../src/main/java/org/apache/log4j/Category.java | 13 +++--
.../org/apache/log4j/bridge/LogEventAdapter.java | 3 +-
.../org/apache/log4j/builders/AbstractBuilder.java | 3 +-
.../org/apache/log4j/builders/BuilderManager.java | 7 ++-
.../org/apache/log4j/helpers/OptionConverter.java | 62 ++++++++++------------
.../java/org/apache/log4j/helpers/QuietWriter.java | 3 +-
.../org/apache/log4j/or/ThreadGroupRenderer.java | 13 +++--
.../org/apache/log4j/or/jms/MessageRenderer.java | 3 +-
.../org/apache/log4j/rewrite/MapRewritePolicy.java | 3 +-
.../org/apache/log4j/xml/Log4jEntityResolver.java | 3 +-
.../org/apache/log4j/xml/XmlConfiguration.java | 47 ++++++++--------
11 files changed, 71 insertions(+), 89 deletions(-)
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/Category.java b/log4j-1.2-api/src/main/java/org/apache/log4j/Category.java
index 2608c6c..0454377 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/Category.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/Category.java
@@ -564,13 +564,12 @@ public class Category {
ObjectRenderer renderer = rendererMap.get(c);
if(renderer != null) {
return renderer;
- } else {
- Class[] ia = c.getInterfaces();
- for (Class clazz : ia) {
- renderer = searchInterfaces(clazz);
- if (renderer != null) {
- return renderer;
- }
+ }
+ Class[] ia = c.getInterfaces();
+ for (Class clazz : ia) {
+ renderer = searchInterfaces(clazz);
+ if (renderer != null) {
+ return renderer;
}
}
return null;
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/LogEventAdapter.java b/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/LogEventAdapter.java
index 894045e..62b7609 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/LogEventAdapter.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/LogEventAdapter.java
@@ -159,9 +159,8 @@ public class LogEventAdapter extends LoggingEvent {
public Object getMDC(String key) {
if (event.getContextData() != null) {
return event.getContextData().getValue(key);
- } else {
- return null;
}
+ return 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 0448ed2..9967ab4 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
@@ -111,9 +111,8 @@ public abstract class AbstractBuilder {
} else if (filter != null) {
if (filter instanceof FilterWrapper) {
return ((FilterWrapper) filter).getFilter();
- } else {
- return new FilterAdapter(filter);
}
+ return new FilterAdapter(filter);
}
return null;
}
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/BuilderManager.java b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/BuilderManager.java
index a204c9b..8b3b156 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/BuilderManager.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/BuilderManager.java
@@ -161,11 +161,10 @@ public class BuilderManager {
Constructor<T> constructor =
(Constructor<T>) clazz.getConstructor(constructorParams);
return constructor.newInstance(prefix, props);
- } else {
- @SuppressWarnings("unchecked")
- T builder = (T) LoaderUtil.newInstanceOf(clazz);
- return builder;
}
+ @SuppressWarnings("unchecked")
+ T builder = (T) LoaderUtil.newInstanceOf(clazz);
+ return builder;
} catch (NoSuchMethodException | InstantiationException | IllegalAccessException | InvocationTargetException ex) {
LOGGER.warn("Unable to load plugin: {} due to: {}", plugin.getKey(), ex.getMessage());
return null;
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 5c8ba53..e559045 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
@@ -164,10 +164,9 @@ public class OptionConverter {
if (hashIndex == -1) {
if ("NULL".equalsIgnoreCase(value)) {
return null;
- } else {
- // no class name specified : use standard Level class
- return Level.toLevel(value, defaultValue);
}
+ // no class name specified : use standard Level class
+ return Level.toLevel(value, defaultValue);
}
Level result = defaultValue;
@@ -305,39 +304,36 @@ public class OptionConverter {
// no more variables
if (i == 0) { // this is a simple string
return val;
- } else { // add the tail string which contails no variables and return the result.
- sbuf.append(val.substring(i, val.length()));
- return sbuf.toString();
}
- } else {
- sbuf.append(val.substring(i, j));
- k = val.indexOf(DELIM_STOP, j);
- if (k == -1) {
- throw new IllegalArgumentException('"' + val +
- "\" has no closing brace. Opening brace at position " + j
- + '.');
- } else {
- j += DELIM_START_LEN;
- String key = val.substring(j, k);
- // first try in System properties
- String replacement = getSystemProperty(key, null);
- // then try props parameter
- if (replacement == null && props != null) {
- replacement = props.getProperty(key);
- }
+ sbuf.append(val.substring(i, val.length()));
+ return sbuf.toString();
+ }
+ sbuf.append(val.substring(i, j));
+ k = val.indexOf(DELIM_STOP, j);
+ if (k == -1) {
+ throw new IllegalArgumentException('"' + val +
+ "\" has no closing brace. Opening brace at position " + j
+ + '.');
+ }
+ j += DELIM_START_LEN;
+ String key = val.substring(j, k);
+ // first try in System properties
+ String replacement = getSystemProperty(key, null);
+ // then try props parameter
+ if (replacement == null && props != null) {
+ replacement = props.getProperty(key);
+ }
- if (replacement != null) {
- // Do variable substitution on the replacement string
- // such that we can solve "Hello ${x2}" as "Hello p1"
- // the where the properties are
- // x1=p1
- // x2=${x1}
- String recursiveReplacement = substVars(replacement, props);
- sbuf.append(recursiveReplacement);
- }
- i = k + DELIM_STOP_LEN;
- }
+ if (replacement != null) {
+ // Do variable substitution on the replacement string
+ // such that we can solve "Hello ${x2}" as "Hello p1"
+ // the where the properties are
+ // x1=p1
+ // x2=${x1}
+ String recursiveReplacement = substVars(replacement, props);
+ sbuf.append(recursiveReplacement);
}
+ i = k + DELIM_STOP_LEN;
}
}
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/QuietWriter.java b/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/QuietWriter.java
index 1779019..6af9aca 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/QuietWriter.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/QuietWriter.java
@@ -62,8 +62,7 @@ public class QuietWriter extends FilterWriter {
if (eh == null) {
// This is a programming error on the part of the enclosing appender.
throw new IllegalArgumentException("Attempted to set null ErrorHandler.");
- } else {
- this.errorHandler = eh;
}
+ this.errorHandler = eh;
}
}
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/or/ThreadGroupRenderer.java b/log4j-1.2-api/src/main/java/org/apache/log4j/or/ThreadGroupRenderer.java
index 08233bf..bd5d6e9 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/or/ThreadGroupRenderer.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/or/ThreadGroupRenderer.java
@@ -45,13 +45,12 @@ public class ThreadGroupRenderer implements ObjectRenderer {
sb.append("]");
}
return sb.toString();
- } else {
- try {
- // this is the best we can do
- return obj.toString();
- } catch(Exception ex) {
- return ex.toString();
- }
+ }
+ try {
+ // this is the best we can do
+ return obj.toString();
+ } catch(Exception ex) {
+ return ex.toString();
}
}
}
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/or/jms/MessageRenderer.java b/log4j-1.2-api/src/main/java/org/apache/log4j/or/jms/MessageRenderer.java
index e6f4b6b..129b0b1 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/or/jms/MessageRenderer.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/or/jms/MessageRenderer.java
@@ -80,8 +80,7 @@ public class MessageRenderer implements ObjectRenderer {
LOGGER.error("Could not parse Message.", e);
}
return sb.toString();
- } else {
- return obj.toString();
}
+ return obj.toString();
}
}
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/rewrite/MapRewritePolicy.java b/log4j-1.2-api/src/main/java/org/apache/log4j/rewrite/MapRewritePolicy.java
index 4f53583..7ebfd68 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/rewrite/MapRewritePolicy.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/rewrite/MapRewritePolicy.java
@@ -105,9 +105,8 @@ public class MapRewritePolicy implements RewritePolicy {
.build();
}
return new LogEventAdapter(event);
- } else {
- return source;
}
+ return source;
}
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/xml/Log4jEntityResolver.java b/log4j-1.2-api/src/main/java/org/apache/log4j/xml/Log4jEntityResolver.java
index edda022..0896dd8 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/xml/Log4jEntityResolver.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/xml/Log4jEntityResolver.java
@@ -44,8 +44,7 @@ public class Log4jEntityResolver implements EntityResolver {
in = new ByteArrayInputStream(new byte[0]);
}
return new InputSource(in);
- } else {
- return null;
}
+ return null;
}
}
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 cbf1551..59b0cba 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
@@ -293,36 +293,31 @@ public class XmlConfiguration extends Log4j1Configuration {
if (appender != null) {
return appender;
- } else {
- // Doesn't work on DOM Level 1 :
- // Element element = doc.getElementById(appenderName);
-
- // Endre's hack:
- Element element = null;
- NodeList list = doc.getElementsByTagName("appender");
- for (int t = 0; t < list.getLength(); t++) {
- Node node = list.item(t);
- NamedNodeMap map = node.getAttributes();
- Node attrNode = map.getNamedItem("name");
- if (appenderName.equals(attrNode.getNodeValue())) {
- element = (Element) node;
- break;
- }
+ }
+ // Endre's hack:
+ Element element = null;
+ NodeList list = doc.getElementsByTagName("appender");
+ for (int t = 0; t < list.getLength(); t++) {
+ Node node = list.item(t);
+ NamedNodeMap map = node.getAttributes();
+ Node attrNode = map.getNamedItem("name");
+ if (appenderName.equals(attrNode.getNodeValue())) {
+ element = (Element) node;
+ break;
}
- // Hack finished.
+ }
+ // Hack finished.
- if (element == null) {
+ if (element == null) {
- LOGGER.error("No appender named [{}] could be found.", appenderName);
- return null;
- } else {
- appender = parseAppender(element);
- if (appender != null) {
- appenderMap.put(appenderName, appender);
- }
- return appender;
- }
+ LOGGER.error("No appender named [{}] could be found.", appenderName);
+ return null;
}
+ appender = parseAppender(element);
+ if (appender != null) {
+ appenderMap.put(appenderName, appender);
+ }
+ return appender;
}
/**
[logging-log4j2] 02/04: Add missing @Override.
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 2dd6ecae70440017232c63141c6240282a749b17
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Nov 16 09:56:21 2020 -0500
Add missing @Override.
---
log4j-1.2-api/src/main/java/org/apache/log4j/WriterAppender.java | 5 +++++
.../main/java/org/apache/log4j/config/PropertiesConfiguration.java | 2 ++
.../src/main/java/org/apache/log4j/helpers/QuietWriter.java | 2 ++
.../src/main/java/org/apache/log4j/or/ThreadGroupRenderer.java | 1 +
.../src/main/java/org/apache/log4j/or/jms/MessageRenderer.java | 1 +
.../src/main/java/org/apache/log4j/rewrite/MapRewritePolicy.java | 1 +
.../main/java/org/apache/log4j/rewrite/PropertyRewritePolicy.java | 1 +
.../src/main/java/org/apache/log4j/xml/Log4jEntityResolver.java | 1 +
.../src/main/java/org/apache/log4j/xml/XmlConfiguration.java | 5 +++++
9 files changed, 19 insertions(+)
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 147990f..cd7b649 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
@@ -124,6 +124,7 @@ public class WriterAppender extends AppenderSkeleton {
/**
* Does nothing.
*/
+ @Override
public void activateOptions() {
}
@@ -139,6 +140,7 @@ public class WriterAppender extends AppenderSkeleton {
* <p>The format of the output will depend on this appender's
* layout.
*/
+ @Override
public void append(LoggingEvent event) {
// Reminder: the nesting of calls is:
@@ -192,6 +194,7 @@ public class WriterAppender extends AppenderSkeleton {
* @see #setWriter
* @since 0.8.4
*/
+ @Override
public
synchronized void close() {
if (this.closed) {
@@ -263,6 +266,7 @@ public class WriterAppender extends AppenderSkeleton {
* Set the {@link ErrorHandler} for this WriterAppender and also the
* underlying {@link QuietWriter} if any.
*/
+ @Override
public synchronized void setErrorHandler(ErrorHandler eh) {
if (eh == null) {
LOGGER.warn("You have tried to set a null error-handler.");
@@ -329,6 +333,7 @@ public class WriterAppender extends AppenderSkeleton {
* The WriterAppender requires a layout. Hence, this method returns
* <code>true</code>.
*/
+ @Override
public boolean requiresLayout() {
return true;
}
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/config/PropertiesConfiguration.java b/log4j-1.2-api/src/main/java/org/apache/log4j/config/PropertiesConfiguration.java
index fd5a749..a6541b4 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/config/PropertiesConfiguration.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/config/PropertiesConfiguration.java
@@ -76,6 +76,7 @@ public class PropertiesConfiguration extends Log4j1Configuration {
registry = new HashMap<>();
}
+ @Override
public void doConfigure() {
InputStream is = getConfigurationSource().getInputStream();
Properties props = new Properties();
@@ -582,6 +583,7 @@ public class PropertiesConfiguration extends Log4j1Configuration {
this.value = value;
}
+ @Override
public String toString() {
return key + "=" + value;
}
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/QuietWriter.java b/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/QuietWriter.java
index 6af9aca..f05ba64 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/QuietWriter.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/QuietWriter.java
@@ -37,6 +37,7 @@ public class QuietWriter extends FilterWriter {
setErrorHandler(errorHandler);
}
+ @Override
public void write(String string) {
if (string != null) {
try {
@@ -48,6 +49,7 @@ public class QuietWriter extends FilterWriter {
}
}
+ @Override
public void flush() {
try {
out.flush();
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/or/ThreadGroupRenderer.java b/log4j-1.2-api/src/main/java/org/apache/log4j/or/ThreadGroupRenderer.java
index bd5d6e9..959d927 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/or/ThreadGroupRenderer.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/or/ThreadGroupRenderer.java
@@ -22,6 +22,7 @@ import org.apache.log4j.Layout;
*/
public class ThreadGroupRenderer implements ObjectRenderer {
+ @Override
public
String doRender(Object obj) {
if(obj instanceof ThreadGroup) {
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/or/jms/MessageRenderer.java b/log4j-1.2-api/src/main/java/org/apache/log4j/or/jms/MessageRenderer.java
index 129b0b1..5cb78fa 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/or/jms/MessageRenderer.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/or/jms/MessageRenderer.java
@@ -33,6 +33,7 @@ public class MessageRenderer implements ObjectRenderer {
/**
Render a {@link javax.jms.Message}.
*/
+ @Override
public
String doRender(Object obj) {
if (obj instanceof Message) {
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/rewrite/MapRewritePolicy.java b/log4j-1.2-api/src/main/java/org/apache/log4j/rewrite/MapRewritePolicy.java
index 7ebfd68..763990d 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/rewrite/MapRewritePolicy.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/rewrite/MapRewritePolicy.java
@@ -49,6 +49,7 @@ public class MapRewritePolicy implements RewritePolicy {
/**
* {@inheritDoc}
*/
+ @Override
public LoggingEvent rewrite(final LoggingEvent source) {
Object msg = source.getMessage();
if (msg instanceof MapMessage || msg instanceof Map) {
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/rewrite/PropertyRewritePolicy.java b/log4j-1.2-api/src/main/java/org/apache/log4j/rewrite/PropertyRewritePolicy.java
index d320d89..4d6dc2e 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/rewrite/PropertyRewritePolicy.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/rewrite/PropertyRewritePolicy.java
@@ -67,6 +67,7 @@ public class PropertyRewritePolicy implements RewritePolicy {
/**
* {@inheritDoc}
*/
+ @Override
public LoggingEvent rewrite(final LoggingEvent source) {
if (!properties.isEmpty()) {
Map<String, String> rewriteProps = source.getProperties() != null ? new HashMap<>(source.getProperties())
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/xml/Log4jEntityResolver.java b/log4j-1.2-api/src/main/java/org/apache/log4j/xml/Log4jEntityResolver.java
index 0896dd8..1417b7d 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/xml/Log4jEntityResolver.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/xml/Log4jEntityResolver.java
@@ -34,6 +34,7 @@ public class Log4jEntityResolver implements EntityResolver {
private static final Logger LOGGER = StatusLogger.getLogger();
private static final String PUBLIC_ID = "-//APACHE//DTD LOG4J 1.2//EN";
+ @Override
public InputSource resolveEntity(String publicId, String systemId) {
if (systemId.endsWith("log4j.dtd") || PUBLIC_ID.equals(publicId)) {
Class clazz = getClass();
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 59b0cba..640f1e5 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
@@ -122,12 +122,14 @@ public class XmlConfiguration extends Log4j1Configuration {
public void doConfigure() throws FactoryConfigurationError {
ConfigurationSource source = getConfigurationSource();
ParseAction action = new ParseAction() {
+ @Override
public Document parse(final DocumentBuilder parser) throws SAXException, IOException {
InputSource inputSource = new InputSource(source.getInputStream());
inputSource.setSystemId("dummy://log4j.dtd");
return parser.parse(inputSource);
}
+ @Override
public String toString() {
return getConfigurationSource().getLocation();
}
@@ -746,14 +748,17 @@ public class XmlConfiguration extends Log4j1Configuration {
private static class SAXErrorHandler implements org.xml.sax.ErrorHandler {
private static final org.apache.logging.log4j.Logger LOGGER = StatusLogger.getLogger();
+ @Override
public void error(final SAXParseException ex) {
emitMessage("Continuable parsing error ", ex);
}
+ @Override
public void fatalError(final SAXParseException ex) {
emitMessage("Fatal parsing error ", ex);
}
+ @Override
public void warning(final SAXParseException ex) {
emitMessage("Parsing warning ", ex);
}
[logging-log4j2] 03/04: Remove trailing whitespace.
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit b8b3778e9fd03c8b153b7ca2fbdd14284720a682
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Nov 16 09:58:06 2020 -0500
Remove trailing whitespace.
---
.../java/org/apache/log4j/config/Log4j1ConfigurationParser.java | 2 +-
.../src/main/java/org/apache/log4j/helpers/OptionConverter.java | 8 ++++----
.../src/main/java/org/apache/log4j/or/jms/MessageRenderer.java | 2 +-
log4j-1.2-api/src/main/java/org/apache/log4j/spi/ErrorCode.java | 4 ++--
log4j-1.2-api/src/test/java/org/apache/log4j/CategoryTest.java | 2 +-
log4j-1.2-api/src/test/java/org/apache/log4j/MDCTestCase.java | 4 ++--
log4j-1.2-api/src/test/java/org/apache/log4j/VelocityTest.java | 6 +++---
7 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationParser.java b/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationParser.java
index 112ab42..ea2834f 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationParser.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationParser.java
@@ -47,7 +47,7 @@ import org.apache.logging.log4j.util.Strings;
* Experimental parser for Log4j 1.2 properties configuration files.
*
* This class is not thread-safe.
- *
+ *
* <p>
* From the Log4j 1.2 Javadocs:
* </p>
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 e559045..59d3d9f 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
@@ -30,7 +30,7 @@ import java.util.Properties;
* A convenience class to convert property values to specific types.
*/
public class OptionConverter {
-
+
static String DELIM_START = "${";
static char DELIM_STOP = '}';
static int DELIM_START_LEN = 2;
@@ -44,7 +44,7 @@ public class OptionConverter {
new CharMap('\b', '\b'),
new CharMap('\"', '\"'),
new CharMap('\'', '\''),
- new CharMap('\\', '\\')
+ new CharMap('\\', '\\')
};
/**
@@ -408,11 +408,11 @@ public class OptionConverter {
return value;
}
}
-
+
private static class CharMap {
final char key;
final char replacement;
-
+
public CharMap(char key, char replacement) {
this.key = key;
this.replacement = replacement;
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/or/jms/MessageRenderer.java b/log4j-1.2-api/src/main/java/org/apache/log4j/or/jms/MessageRenderer.java
index 5cb78fa..1666a07 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/or/jms/MessageRenderer.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/or/jms/MessageRenderer.java
@@ -29,7 +29,7 @@ import javax.jms.DeliveryMode;
*/
public class MessageRenderer implements ObjectRenderer {
private static final Logger LOGGER = StatusLogger.getLogger();
-
+
/**
Render a {@link javax.jms.Message}.
*/
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 7fbbf95..3de40ca 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
@@ -5,9 +5,9 @@
* 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.
diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/CategoryTest.java b/log4j-1.2-api/src/test/java/org/apache/log4j/CategoryTest.java
index 6a8af76..6ea36c9 100644
--- a/log4j-1.2-api/src/test/java/org/apache/log4j/CategoryTest.java
+++ b/log4j-1.2-api/src/test/java/org/apache/log4j/CategoryTest.java
@@ -65,7 +65,7 @@ public class CategoryTest {
public void before() {
appender.clear();
}
-
+
/**
* Tests Category.forcedLog.
*/
diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/MDCTestCase.java b/log4j-1.2-api/src/test/java/org/apache/log4j/MDCTestCase.java
index c0e5ba5..97bf1ff 100644
--- a/log4j-1.2-api/src/test/java/org/apache/log4j/MDCTestCase.java
+++ b/log4j-1.2-api/src/test/java/org/apache/log4j/MDCTestCase.java
@@ -5,9 +5,9 @@
* 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.
diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/VelocityTest.java b/log4j-1.2-api/src/test/java/org/apache/log4j/VelocityTest.java
index 99bd5a2..c1165d7 100644
--- a/log4j-1.2-api/src/test/java/org/apache/log4j/VelocityTest.java
+++ b/log4j-1.2-api/src/test/java/org/apache/log4j/VelocityTest.java
@@ -34,7 +34,7 @@ import org.junit.Test;
public class VelocityTest {
private static LoggerContext context;
-
+
@BeforeClass
public static void setupClass() {
context = LoggerContext.getContext(false);
@@ -44,8 +44,8 @@ private static LoggerContext context;
public static void tearDownClass() {
Configurator.shutdown(context);
StatusLogger.getLogger().reset();
- }
-
+ }
+
@Test
public void testVelocity() {
Velocity.init();