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 2015/07/08 11:45:51 UTC
logging-log4j2 git commit: Replace if-null-test-then-throw-NPE
pattern with Java 7's Objects.requireNonNull() API.
Repository: logging-log4j2
Updated Branches:
refs/heads/master 0de636c13 -> 793da5e51
Replace if-null-test-then-throw-NPE pattern with Java 7's
Objects.requireNonNull() API.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/793da5e5
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/793da5e5
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/793da5e5
Branch: refs/heads/master
Commit: 793da5e51d1fea9e024dc42357bea700c224fb3c
Parents: 0de636c
Author: ggregory <gg...@apache.org>
Authored: Wed Jul 8 02:45:47 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Wed Jul 8 02:45:47 2015 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/logging/log4j/Level.java | 5 ++---
.../core/appender/rolling/RolloverDescriptionImpl.java | 6 +++---
.../core/appender/rolling/action/Bzip2CompressAction.java | 10 +++-------
.../core/appender/rolling/action/GzCompressAction.java | 10 +++-------
.../core/appender/rolling/action/ZipCompressAction.java | 10 +++-------
.../core/config/plugins/processor/PluginProcessor.java | 5 ++---
.../logging/log4j/core/filter/DynamicThresholdFilter.java | 5 ++---
.../org/apache/logging/log4j/core/filter/MapFilter.java | 5 ++---
.../org/apache/logging/log4j/core/impl/Log4jLogEvent.java | 5 ++---
.../apache/logging/log4j/core/pattern/PatternParser.java | 5 ++---
10 files changed, 24 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/793da5e5/log4j-api/src/main/java/org/apache/logging/log4j/Level.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/Level.java b/log4j-api/src/main/java/org/apache/logging/log4j/Level.java
index 5bbc5a6..b20a5ff 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/Level.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/Level.java
@@ -19,6 +19,7 @@ package org.apache.logging.log4j;
import java.io.Serializable;
import java.util.Collection;
import java.util.Locale;
+import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
@@ -276,9 +277,7 @@ public final class Level implements Comparable<Level>, Serializable {
* @throws java.lang.IllegalArgumentException if the Level name is not registered.
*/
public static Level valueOf(final String name) {
- if (name == null) {
- throw new NullPointerException("No level name given.");
- }
+ Objects.requireNonNull(name, "No level name given.");
final String levelName = name.toUpperCase(Locale.ENGLISH);
if (levels.containsKey(levelName)) {
return levels.get(levelName);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/793da5e5/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RolloverDescriptionImpl.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RolloverDescriptionImpl.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RolloverDescriptionImpl.java
index 70f2315..8b1c848 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RolloverDescriptionImpl.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RolloverDescriptionImpl.java
@@ -16,6 +16,8 @@
*/
package org.apache.logging.log4j.core.appender.rolling;
+import java.util.Objects;
+
import org.apache.logging.log4j.core.appender.rolling.action.Action;
/**
@@ -55,9 +57,7 @@ public final class RolloverDescriptionImpl implements RolloverDescription {
*/
public RolloverDescriptionImpl(final String activeFileName, final boolean append, final Action synchronous,
final Action asynchronous) {
- if (activeFileName == null) {
- throw new NullPointerException("activeFileName");
- }
+ Objects.requireNonNull(activeFileName, "activeFileName");
this.append = append;
this.activeFileName = activeFileName;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/793da5e5/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/Bzip2CompressAction.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/Bzip2CompressAction.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/Bzip2CompressAction.java
index 3556415..e3f2b27 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/Bzip2CompressAction.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/Bzip2CompressAction.java
@@ -21,6 +21,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.util.Objects;
import org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream;
@@ -55,13 +56,8 @@ public final class Bzip2CompressAction extends AbstractAction {
* to be thrown or affect return value.
*/
public Bzip2CompressAction(final File source, final File destination, final boolean deleteSource) {
- if (source == null) {
- throw new NullPointerException("source");
- }
-
- if (destination == null) {
- throw new NullPointerException("destination");
- }
+ Objects.requireNonNull(source, "source");
+ Objects.requireNonNull(destination, "destination");
this.source = source;
this.destination = destination;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/793da5e5/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/GzCompressAction.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/GzCompressAction.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/GzCompressAction.java
index 0b20b41..61fb987 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/GzCompressAction.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/GzCompressAction.java
@@ -21,6 +21,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.util.Objects;
import java.util.zip.GZIPOutputStream;
/**
@@ -54,13 +55,8 @@ public final class GzCompressAction extends AbstractAction {
* does not cause an exception to be thrown or affect return value.
*/
public GzCompressAction(final File source, final File destination, final boolean deleteSource) {
- if (source == null) {
- throw new NullPointerException("source");
- }
-
- if (destination == null) {
- throw new NullPointerException("destination");
- }
+ Objects.requireNonNull(source, "source");
+ Objects.requireNonNull(destination, "destination");
this.source = source;
this.destination = destination;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/793da5e5/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/ZipCompressAction.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/ZipCompressAction.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/ZipCompressAction.java
index b2bc8e5..5a61270 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/ZipCompressAction.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/ZipCompressAction.java
@@ -20,6 +20,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.util.Objects;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
@@ -61,13 +62,8 @@ public final class ZipCompressAction extends AbstractAction {
* @param level TODO
*/
public ZipCompressAction(final File source, final File destination, final boolean deleteSource, final int level) {
- if (source == null) {
- throw new NullPointerException("source");
- }
-
- if (destination == null) {
- throw new NullPointerException("destination");
- }
+ Objects.requireNonNull(source, "source");
+ Objects.requireNonNull(destination, "destination");
this.source = source;
this.destination = destination;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/793da5e5/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/PluginProcessor.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/PluginProcessor.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/PluginProcessor.java
index 0ad00d3..ff4e25b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/PluginProcessor.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/PluginProcessor.java
@@ -39,6 +39,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
/**
@@ -121,9 +122,7 @@ public class PluginProcessor extends AbstractProcessor {
@Override
public PluginEntry visitType(final TypeElement e, final Plugin plugin) {
- if (plugin == null) {
- throw new NullPointerException("Plugin annotation is null.");
- }
+ Objects.requireNonNull(plugin, "Plugin annotation is null.");
final PluginEntry entry = new PluginEntry();
entry.setKey(plugin.name().toLowerCase());
entry.setClassName(elements.getBinaryName(e).toString());
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/793da5e5/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java
index 4d320d2..03edbdc 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java
@@ -18,6 +18,7 @@ package org.apache.logging.log4j.core.filter;
import java.util.HashMap;
import java.util.Map;
+import java.util.Objects;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Marker;
@@ -72,9 +73,7 @@ public final class DynamicThresholdFilter extends AbstractFilter {
private DynamicThresholdFilter(final String key, final Map<String, Level> pairs, final Level defaultLevel,
final Result onMatch, final Result onMismatch) {
super(onMatch, onMismatch);
- if (key == null) {
- throw new NullPointerException("key cannot be null");
- }
+ Objects.requireNonNull(key, "key cannot be null");
this.key = key;
this.levelMap = pairs;
this.defaultThreshold = defaultLevel;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/793da5e5/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java
index 920c549..89ecfe6 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java
@@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Marker;
@@ -50,9 +51,7 @@ public class MapFilter extends AbstractFilter {
protected MapFilter(final Map<String, List<String>> map, final boolean oper, final Result onMatch,
final Result onMismatch) {
super(onMatch, onMismatch);
- if (map == null) {
- throw new NullPointerException("key cannot be null");
- }
+ Objects.requireNonNull(map, "map cannot be null");
this.isAnd = oper;
this.map = map;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/793da5e5/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
index e9ea597..e57aa2e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
@@ -23,6 +23,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Marker;
@@ -435,9 +436,7 @@ public class Log4jLogEvent implements LogEvent {
}
public static Log4jLogEvent deserialize(final Serializable event) {
- if (event == null) {
- throw new NullPointerException("Event cannot be null");
- }
+ Objects.requireNonNull(event, "Event cannot be null");
if (event instanceof LogEventProxy) {
final LogEventProxy proxy = (LogEventProxy) event;
final Log4jLogEvent result = new Log4jLogEvent(proxy.loggerName, proxy.marker,
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/793da5e5/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java
index edc8d17..28d4180 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java
@@ -30,6 +30,7 @@ import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
/**
* Most of the work of the {@link org.apache.logging.log4j.core.layout.PatternLayout} class is delegated to the
@@ -303,9 +304,7 @@ public final class PatternParser {
public void parse(final String pattern, final List<PatternConverter> patternConverters,
final List<FormattingInfo> formattingInfos, final boolean noConsoleNoAnsi,
final boolean convertBackslashes) {
- if (pattern == null) {
- throw new NullPointerException("pattern");
- }
+ Objects.requireNonNull(pattern, "pattern");
final StringBuilder currentLiteral = new StringBuilder(BUF_SIZE);