You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2016/06/18 20:09:22 UTC
[16/26] logging-log4j2 git commit: Statement unnecessarily nested
within else clause.
Statement unnecessarily nested within else clause.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/e962b162
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/e962b162
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/e962b162
Branch: refs/heads/feature/LOG4J2-1430
Commit: e962b162f8a5e9506f2dc69abde6331074d8c217
Parents: 706400b
Author: ggregory <gg...@apache.org>
Authored: Fri Jun 17 13:33:26 2016 -0700
Committer: ggregory <gg...@apache.org>
Committed: Fri Jun 17 13:33:26 2016 -0700
----------------------------------------------------------------------
.../log4j/core/config/ConfigurationFactory.java | 19 +++++++++----------
.../logging/log4j/core/config/Configurator.java | 3 +--
.../config/composite/DefaultMergeStrategy.java | 3 +--
.../log4j/core/filter/CompositeFilter.java | 7 +++----
.../log4j/core/pattern/NameAbbreviator.java | 3 +--
.../AsyncAppenderLog4j2LocationBenchmark.java | 2 --
.../perf/jmh/AsyncAppenderLogbackBenchmark.java | 1 -
.../AsyncAppenderLogbackLocationBenchmark.java | 2 --
.../perf/jmh/AsyncLoggersLocationBenchmark.java | 2 --
.../jmh/MemoryHandlerJULLocationBenchmark.java | 2 --
.../perf/jmh/ThreadsafeDateFormatBenchmark.java | 6 ++----
11 files changed, 17 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e962b162/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java
index 6497253..a5c54ac 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java
@@ -408,16 +408,15 @@ public abstract class ConfigurationFactory extends ConfigurationBuilderFactory {
return new CompositeConfiguration(configs);
}
return getConfiguration(configLocationStr);
- } else {
- for (final ConfigurationFactory factory : getFactories()) {
- final String[] types = factory.getSupportedTypes();
- if (types != null) {
- for (final String type : types) {
- if (type.equals("*")) {
- final Configuration config = factory.getConfiguration(name, configLocation);
- if (config != null) {
- return config;
- }
+ }
+ for (final ConfigurationFactory factory : getFactories()) {
+ final String[] types = factory.getSupportedTypes();
+ if (types != null) {
+ for (final String type : types) {
+ if (type.equals("*")) {
+ final Configuration config = factory.getConfiguration(name, configLocation);
+ if (config != null) {
+ return config;
}
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e962b162/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Configurator.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Configurator.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Configurator.java
index 6de2506..e8286c1 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Configurator.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Configurator.java
@@ -126,9 +126,8 @@ public final class Configurator {
uris.add(uri);
}
return initialize(name, loader, uris, externalContext);
- } else {
- return initialize(name, loader, NetUtils.toURI(configLocation), externalContext);
}
+ return initialize(name, loader, NetUtils.toURI(configLocation), externalContext);
}
/**
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e962b162/log4j-core/src/main/java/org/apache/logging/log4j/core/config/composite/DefaultMergeStrategy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/composite/DefaultMergeStrategy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/composite/DefaultMergeStrategy.java
index 0eaa9f6..0263ec2 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/composite/DefaultMergeStrategy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/composite/DefaultMergeStrategy.java
@@ -122,9 +122,8 @@ public class DefaultMergeStrategy implements MergeStrategy {
updateFilterNode(target, targetChildNode, sourceChildNode, pluginManager);
isMerged = true;
break;
- } else {
- continue;
}
+ continue;
}
if (!targetChildNode.getName().equalsIgnoreCase(sourceChildNode.getName())) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e962b162/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java
index 2b0a400..33f72d5 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java
@@ -64,11 +64,10 @@ public final class CompositeFilter extends AbstractLifeCycle implements Iterable
copy[index] = currentFilter;
}
return new CompositeFilter(copy);
- } else {
- final Filter[] copy = Arrays.copyOf(this.filters, this.filters.length + 1);
- copy[this.filters.length] = filter;
- return new CompositeFilter(copy);
}
+ final Filter[] copy = Arrays.copyOf(this.filters, this.filters.length + 1);
+ copy[this.filters.length] = filter;
+ return new CompositeFilter(copy);
}
public CompositeFilter removeFilter(final Filter filter) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e962b162/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/NameAbbreviator.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/NameAbbreviator.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/NameAbbreviator.java
index bc114f1..1011937 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/NameAbbreviator.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/NameAbbreviator.java
@@ -235,9 +235,8 @@ public abstract class NameAbbreviator {
if (nextStart == -1) {
destination.append(original);
return;
- } else {
- start = nextStart + 1;
}
+ start = nextStart + 1;
}
destination.append(original, start, original.length());
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e962b162/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLog4j2LocationBenchmark.java
----------------------------------------------------------------------
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLog4j2LocationBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLog4j2LocationBenchmark.java
index c306ac1..815a9f9 100644
--- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLog4j2LocationBenchmark.java
+++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLog4j2LocationBenchmark.java
@@ -33,8 +33,6 @@ import org.openjdk.jmh.annotations.Setup;
import org.openjdk.jmh.annotations.State;
import org.openjdk.jmh.annotations.TearDown;
-import static org.apache.logging.log4j.perf.util.BenchmarkMessageParams.*;
-
/**
* Tests Log4j2 Async Appender performance when including caller location information.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e962b162/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLogbackBenchmark.java
----------------------------------------------------------------------
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLogbackBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLogbackBenchmark.java
index 76af917..0539d6d 100644
--- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLogbackBenchmark.java
+++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLogbackBenchmark.java
@@ -17,7 +17,6 @@
package org.apache.logging.log4j.perf.jmh;
import java.io.File;
-import java.util.Arrays;
import java.util.concurrent.TimeUnit;
import org.apache.logging.log4j.perf.util.BenchmarkMessageParams;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e962b162/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLogbackLocationBenchmark.java
----------------------------------------------------------------------
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLogbackLocationBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLogbackLocationBenchmark.java
index 708bc24..ceddf0f 100644
--- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLogbackLocationBenchmark.java
+++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLogbackLocationBenchmark.java
@@ -34,8 +34,6 @@ import org.slf4j.LoggerFactory;
import ch.qos.logback.core.spi.LifeCycle;
-import static org.apache.logging.log4j.perf.util.BenchmarkMessageParams.*;
-
/**
* Tests Logback Async Appender performance when including caller location information.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e962b162/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncLoggersLocationBenchmark.java
----------------------------------------------------------------------
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncLoggersLocationBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncLoggersLocationBenchmark.java
index 92cdeb6..b7f6208 100644
--- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncLoggersLocationBenchmark.java
+++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncLoggersLocationBenchmark.java
@@ -34,8 +34,6 @@ import org.openjdk.jmh.annotations.Setup;
import org.openjdk.jmh.annotations.State;
import org.openjdk.jmh.annotations.TearDown;
-import static org.apache.logging.log4j.perf.util.BenchmarkMessageParams.*;
-
/**
* Tests Log4j2 Async Loggers performance.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e962b162/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/MemoryHandlerJULLocationBenchmark.java
----------------------------------------------------------------------
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/MemoryHandlerJULLocationBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/MemoryHandlerJULLocationBenchmark.java
index b91203f..53cbc34 100644
--- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/MemoryHandlerJULLocationBenchmark.java
+++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/MemoryHandlerJULLocationBenchmark.java
@@ -32,8 +32,6 @@ import org.openjdk.jmh.annotations.Scope;
import org.openjdk.jmh.annotations.Setup;
import org.openjdk.jmh.annotations.State;
-import static org.apache.logging.log4j.perf.util.BenchmarkMessageParams.*;
-
/**
* Tests JUL (java.util.logging) Memory Handler performance when including caller location information.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e962b162/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadsafeDateFormatBenchmark.java
----------------------------------------------------------------------
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadsafeDateFormatBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadsafeDateFormatBenchmark.java
index d1a6240..885c357 100644
--- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadsafeDateFormatBenchmark.java
+++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadsafeDateFormatBenchmark.java
@@ -208,9 +208,8 @@ public class ThreadsafeDateFormatBenchmark {
final CachedTimeFastFormat newTime = new CachedTimeFastFormat(timestamp);
if (cachedTimeFastFmt.compareAndSet(current, newTime)) {
return newTime.formatted;
- } else {
- return cachedTimeFastFmt.get().formatted;
}
+ return cachedTimeFastFmt.get().formatted;
}
return current.formatted;
@@ -226,9 +225,8 @@ public class ThreadsafeDateFormatBenchmark {
final CachedTimeFixedFmt newTime = new CachedTimeFixedFmt(timestamp);
if (cachedTimeFixedFmt.compareAndSet(current, newTime)) {
return newTime.formatted;
- } else {
- return cachedTimeFixedFmt.get().formatted;
}
+ return cachedTimeFixedFmt.get().formatted;
}
return current.formatted;