You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by br...@apache.org on 2017/05/17 15:03:59 UTC
[15/50] [lang] use Validate#notNull instead of "throw new
NullPointerException"
use Validate#notNull instead of "throw new NullPointerException"
Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-lang/commit/52d6e24d
Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/52d6e24d
Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/52d6e24d
Branch: refs/heads/release
Commit: 52d6e24d19465e6f468839650c969d5931f66d65
Parents: 82cc244
Author: pascalschumacher <pa...@gmx.net>
Authored: Wed Apr 19 20:17:58 2017 +0200
Committer: pascalschumacher <pa...@gmx.net>
Committed: Wed Apr 19 20:17:58 2017 +0200
----------------------------------------------------------------------
.../java/org/apache/commons/lang3/ClassUtils.java | 5 ++---
.../java/org/apache/commons/lang3/ObjectUtils.java | 16 ++++------------
src/main/java/org/apache/commons/lang3/Range.java | 6 ++----
.../lang3/concurrent/BasicThreadFactory.java | 17 +++++------------
.../org/apache/commons/lang3/time/FormatCache.java | 6 +++---
5 files changed, 16 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/52d6e24d/src/main/java/org/apache/commons/lang3/ClassUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/lang3/ClassUtils.java b/src/main/java/org/apache/commons/lang3/ClassUtils.java
index 012d2a6..60395ef 100644
--- a/src/main/java/org/apache/commons/lang3/ClassUtils.java
+++ b/src/main/java/org/apache/commons/lang3/ClassUtils.java
@@ -1053,9 +1053,8 @@ public class ClassUtils {
*/
private static String toCanonicalName(String className) {
className = StringUtils.deleteWhitespace(className);
- if (className == null) {
- throw new NullPointerException("className must not be null.");
- } else if (className.endsWith("[]")) {
+ Validate.notNull(className, "className must not be null.");
+ if (className.endsWith("[]")) {
final StringBuilder classNameBuffer = new StringBuilder();
while (className.endsWith("[]")) {
className = className.substring(0, className.length() - 2);
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/52d6e24d/src/main/java/org/apache/commons/lang3/ObjectUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/lang3/ObjectUtils.java b/src/main/java/org/apache/commons/lang3/ObjectUtils.java
index 2edd81f..13d1256 100644
--- a/src/main/java/org/apache/commons/lang3/ObjectUtils.java
+++ b/src/main/java/org/apache/commons/lang3/ObjectUtils.java
@@ -353,9 +353,7 @@ public class ObjectUtils {
* @since 3.2
*/
public static void identityToString(final Appendable appendable, final Object object) throws IOException {
- if (object == null) {
- throw new NullPointerException("Cannot get the toString of a null identity");
- }
+ Validate.notNull(object, "Cannot get the toString of a null identity");
appendable.append(object.getClass().getName())
.append('@')
.append(Integer.toHexString(System.identityHashCode(object)));
@@ -379,9 +377,7 @@ public class ObjectUtils {
*/
@Deprecated
public static void identityToString(final StrBuilder builder, final Object object) {
- if (object == null) {
- throw new NullPointerException("Cannot get the toString of a null identity");
- }
+ Validate.notNull(object, "Cannot get the toString of a null identity");
builder.append(object.getClass().getName())
.append('@')
.append(Integer.toHexString(System.identityHashCode(object)));
@@ -403,9 +399,7 @@ public class ObjectUtils {
* @since 2.4
*/
public static void identityToString(final StringBuffer buffer, final Object object) {
- if (object == null) {
- throw new NullPointerException("Cannot get the toString of a null identity");
- }
+ Validate.notNull(object, "Cannot get the toString of a null identity");
buffer.append(object.getClass().getName())
.append('@')
.append(Integer.toHexString(System.identityHashCode(object)));
@@ -427,9 +421,7 @@ public class ObjectUtils {
* @since 3.2
*/
public static void identityToString(final StringBuilder builder, final Object object) {
- if (object == null) {
- throw new NullPointerException("Cannot get the toString of a null identity");
- }
+ Validate.notNull(object, "Cannot get the toString of a null identity");
builder.append(object.getClass().getName())
.append('@')
.append(Integer.toHexString(System.identityHashCode(object)));
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/52d6e24d/src/main/java/org/apache/commons/lang3/Range.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/lang3/Range.java b/src/main/java/org/apache/commons/lang3/Range.java
index 73e6969..29ad7a3 100644
--- a/src/main/java/org/apache/commons/lang3/Range.java
+++ b/src/main/java/org/apache/commons/lang3/Range.java
@@ -285,10 +285,8 @@ public final class Range<T> implements Serializable {
* @return -1, 0 or +1 depending on the element's location relative to the range
*/
public int elementCompareTo(final T element) {
- if (element == null) {
- // Comparable API says throw NPE on null
- throw new NullPointerException("Element is null");
- }
+ // Comparable API says throw NPE on null
+ Validate.notNull(element, "Element is null");
if (isAfter(element)) {
return -1;
} else if (isBefore(element)) {
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/52d6e24d/src/main/java/org/apache/commons/lang3/concurrent/BasicThreadFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/lang3/concurrent/BasicThreadFactory.java b/src/main/java/org/apache/commons/lang3/concurrent/BasicThreadFactory.java
index 9164cca..b25a51a 100644
--- a/src/main/java/org/apache/commons/lang3/concurrent/BasicThreadFactory.java
+++ b/src/main/java/org/apache/commons/lang3/concurrent/BasicThreadFactory.java
@@ -20,6 +20,8 @@ import java.util.concurrent.Executors;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.atomic.AtomicLong;
+import org.apache.commons.lang3.Validate;
+
/**
* <p>
* An implementation of the {@code ThreadFactory} interface that provides some
@@ -278,10 +280,7 @@ public class BasicThreadFactory implements ThreadFactory {
* is <b>null</b>
*/
public Builder wrappedFactory(final ThreadFactory factory) {
- if (factory == null) {
- throw new NullPointerException(
- "Wrapped ThreadFactory must not be null!");
- }
+ Validate.notNull(factory, "Wrapped ThreadFactory must not be null!");
wrappedFactory = factory;
return this;
@@ -296,10 +295,7 @@ public class BasicThreadFactory implements ThreadFactory {
* @throws NullPointerException if the naming pattern is <b>null</b>
*/
public Builder namingPattern(final String pattern) {
- if (pattern == null) {
- throw new NullPointerException(
- "Naming pattern must not be null!");
- }
+ Validate.notNull(pattern, "Naming pattern must not be null!");
namingPattern = pattern;
return this;
@@ -341,10 +337,7 @@ public class BasicThreadFactory implements ThreadFactory {
*/
public Builder uncaughtExceptionHandler(
final Thread.UncaughtExceptionHandler handler) {
- if (handler == null) {
- throw new NullPointerException(
- "Uncaught exception handler must not be null!");
- }
+ Validate.notNull(handler, "Uncaught exception handler must not be null!");
exceptionHandler = handler;
return this;
http://git-wip-us.apache.org/repos/asf/commons-lang/blob/52d6e24d/src/main/java/org/apache/commons/lang3/time/FormatCache.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/lang3/time/FormatCache.java b/src/main/java/org/apache/commons/lang3/time/FormatCache.java
index affb7ab..22850f6 100644
--- a/src/main/java/org/apache/commons/lang3/time/FormatCache.java
+++ b/src/main/java/org/apache/commons/lang3/time/FormatCache.java
@@ -25,6 +25,8 @@ import java.util.TimeZone;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
+import org.apache.commons.lang3.Validate;
+
/**
* <p>FormatCache is a cache and factory for {@link Format}s.</p>
*
@@ -67,9 +69,7 @@ abstract class FormatCache<F extends Format> {
* or <code>null</code>
*/
public F getInstance(final String pattern, TimeZone timeZone, Locale locale) {
- if (pattern == null) {
- throw new NullPointerException("pattern must not be null");
- }
+ Validate.notNull(pattern, "pattern must not be null");
if (timeZone == null) {
timeZone = TimeZone.getDefault();
}