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:37 UTC
[logging-log4j2] 01/04: No need to nest else clauses.
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;
}
/**