removes unnecessary class reference of static method calls which are declared in the same class
Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-lang/commit/b610707c Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/b610707c Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/b610707c Branch: refs/heads/master Commit: b610707cd072f07efb816074a4844bb1b31e482c Parents: 214cc7f Author: Igor Curdvanovschi <ingvar....@gmail.com> Authored: Wed Jun 20 14:28:10 2018 +0300 Committer: Igor Curdvanovschi <ingvar....@gmail.com> Committed: Wed Jun 20 14:28:10 2018 +0300 ---------------------------------------------------------------------- .../java/org/apache/commons/lang3/ArrayUtils.java | 18 +++++++++--------- .../java/org/apache/commons/lang3/ClassUtils.java | 4 ++-- .../org/apache/commons/lang3/ObjectUtils.java | 6 +++--- .../apache/commons/lang3/SerializationUtils.java | 4 ++-- .../org/apache/commons/lang3/StringUtils.java | 6 +++--- .../org/apache/commons/lang3/SystemUtils.java | 2 +- .../java/org/apache/commons/lang3/Validate.java | 10 +++++----- .../commons/lang3/builder/ToStringStyle.java | 14 +++++++------- .../commons/lang3/exception/ExceptionUtils.java | 4 ++-- .../org/apache/commons/lang3/math/Fraction.java | 2 +- .../apache/commons/lang3/math/NumberUtils.java | 4 ++-- .../apache/commons/lang3/reflect/MemberUtils.java | 4 ++-- .../apache/commons/lang3/reflect/TypeUtils.java | 10 +++++----- .../apache/commons/lang3/text/StrSubstitutor.java | 2 +- .../org/apache/commons/lang3/time/DateUtils.java | 6 +++--- .../commons/lang3/time/FastDatePrinter.java | 6 +++--- .../apache/commons/lang3/tuple/ImmutablePair.java | 2 +- .../commons/lang3/tuple/ImmutableTriple.java | 2 +- 18 files changed, 53 insertions(+), 53 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-lang/blob/b610707c/src/main/java/org/apache/commons/lang3/ArrayUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/ArrayUtils.java b/src/main/java/org/apache/commons/lang3/ArrayUtils.java index 857dd70..daf9596 100644 --- a/src/main/java/org/apache/commons/lang3/ArrayUtils.java +++ b/src/main/java/org/apache/commons/lang3/ArrayUtils.java @@ -3870,7 +3870,7 @@ public class ArrayUtils { * {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input */ public static int indexOf(final double[] array, final double valueToFind, int startIndex) { - if (ArrayUtils.isEmpty(array)) { + if (isEmpty(array)) { return INDEX_NOT_FOUND; } if (startIndex < 0) { @@ -3902,7 +3902,7 @@ public class ArrayUtils { * {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input */ public static int indexOf(final double[] array, final double valueToFind, int startIndex, final double tolerance) { - if (ArrayUtils.isEmpty(array)) { + if (isEmpty(array)) { return INDEX_NOT_FOUND; } if (startIndex < 0) { @@ -3964,7 +3964,7 @@ public class ArrayUtils { * {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input */ public static int lastIndexOf(final double[] array, final double valueToFind, int startIndex) { - if (ArrayUtils.isEmpty(array)) { + if (isEmpty(array)) { return INDEX_NOT_FOUND; } if (startIndex < 0) { @@ -3998,7 +3998,7 @@ public class ArrayUtils { * {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input */ public static int lastIndexOf(final double[] array, final double valueToFind, int startIndex, final double tolerance) { - if (ArrayUtils.isEmpty(array)) { + if (isEmpty(array)) { return INDEX_NOT_FOUND; } if (startIndex < 0) { @@ -4077,7 +4077,7 @@ public class ArrayUtils { * {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input */ public static int indexOf(final float[] array, final float valueToFind, int startIndex) { - if (ArrayUtils.isEmpty(array)) { + if (isEmpty(array)) { return INDEX_NOT_FOUND; } if (startIndex < 0) { @@ -4120,7 +4120,7 @@ public class ArrayUtils { * {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input */ public static int lastIndexOf(final float[] array, final float valueToFind, int startIndex) { - if (ArrayUtils.isEmpty(array)) { + if (isEmpty(array)) { return INDEX_NOT_FOUND; } if (startIndex < 0) { @@ -4181,7 +4181,7 @@ public class ArrayUtils { * array input */ public static int indexOf(final boolean[] array, final boolean valueToFind, int startIndex) { - if (ArrayUtils.isEmpty(array)) { + if (isEmpty(array)) { return INDEX_NOT_FOUND; } if (startIndex < 0) { @@ -4225,7 +4225,7 @@ public class ArrayUtils { * {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or {@code null} array input */ public static int lastIndexOf(final boolean[] array, final boolean valueToFind, int startIndex) { - if (ArrayUtils.isEmpty(array)) { + if (isEmpty(array)) { return INDEX_NOT_FOUND; } if (startIndex < 0) { @@ -7436,7 +7436,7 @@ public class ArrayUtils { */ // package protected for access by unit tests static Object removeAll(final Object array, final BitSet indices) { - final int srcLength = ArrayUtils.getLength(array); + final int srcLength = getLength(array); // No need to check maxIndex here, because method only currently called from removeElements() // which guarantee to generate on;y valid bit entries. // final int maxIndex = indices.length(); http://git-wip-us.apache.org/repos/asf/commons-lang/blob/b610707c/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 7456626..799fa1c 100644 --- a/src/main/java/org/apache/commons/lang3/ClassUtils.java +++ b/src/main/java/org/apache/commons/lang3/ClassUtils.java @@ -1263,7 +1263,7 @@ public class ClassUtils { * @since 2.4 */ public static String getShortCanonicalName(final String canonicalName) { - return ClassUtils.getShortClassName(getCanonicalName(canonicalName)); + return getShortClassName(getCanonicalName(canonicalName)); } // Package name @@ -1308,7 +1308,7 @@ public class ClassUtils { * @since 2.4 */ public static String getPackageCanonicalName(final String canonicalName) { - return ClassUtils.getPackageName(getCanonicalName(canonicalName)); + return getPackageName(getCanonicalName(canonicalName)); } /** http://git-wip-us.apache.org/repos/asf/commons-lang/blob/b610707c/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 2f0c668..c18e33b 100644 --- a/src/main/java/org/apache/commons/lang3/ObjectUtils.java +++ b/src/main/java/org/apache/commons/lang3/ObjectUtils.java @@ -253,7 +253,7 @@ public class ObjectUtils { * @return {@code false} if the values of both objects are the same */ public static boolean notEqual(final Object object1, final Object object2) { - return !ObjectUtils.equals(object1, object2); + return !equals(object1, object2); } /** @@ -304,7 +304,7 @@ public class ObjectUtils { int hash = 1; if (objects != null) { for (final Object object : objects) { - final int tmpHash = ObjectUtils.hashCode(object); + final int tmpHash = hashCode(object); hash = hash * 31 + tmpHash; } } @@ -779,7 +779,7 @@ public class ObjectUtils { * @return the singleton value */ private Object readResolve() { - return ObjectUtils.NULL; + return NULL; } } http://git-wip-us.apache.org/repos/asf/commons-lang/blob/b610707c/src/main/java/org/apache/commons/lang3/SerializationUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/SerializationUtils.java b/src/main/java/org/apache/commons/lang3/SerializationUtils.java index 69c3664..abe0331 100644 --- a/src/main/java/org/apache/commons/lang3/SerializationUtils.java +++ b/src/main/java/org/apache/commons/lang3/SerializationUtils.java @@ -112,7 +112,7 @@ public class SerializationUtils { */ @SuppressWarnings("unchecked") // OK, because we serialized a type `T` public static <T extends Serializable> T roundtrip(final T msg) { - return (T) SerializationUtils.deserialize(SerializationUtils.serialize(msg)); + return (T) deserialize(serialize(msg)); } // Serialize @@ -220,7 +220,7 @@ public class SerializationUtils { */ public static <T> T deserialize(final byte[] objectData) { Validate.isTrue(objectData != null, "The byte[] must not be null"); - return SerializationUtils.deserialize(new ByteArrayInputStream(objectData)); + return deserialize(new ByteArrayInputStream(objectData)); } /** http://git-wip-us.apache.org/repos/asf/commons-lang/blob/b610707c/src/main/java/org/apache/commons/lang3/StringUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/StringUtils.java b/src/main/java/org/apache/commons/lang3/StringUtils.java index b3a92f4..ff06e8c 100644 --- a/src/main/java/org/apache/commons/lang3/StringUtils.java +++ b/src/main/java/org/apache/commons/lang3/StringUtils.java @@ -959,7 +959,7 @@ public class StringUtils { final StringBuilder decomposed = new StringBuilder(Normalizer.normalize(input, Normalizer.Form.NFD)); convertRemainingAccentCharacters(decomposed); // Note that this doesn't correctly remove ligatures... - return pattern.matcher(decomposed).replaceAll(StringUtils.EMPTY); + return pattern.matcher(decomposed).replaceAll(EMPTY); } private static void convertRemainingAccentCharacters(final StringBuilder decomposed) { @@ -5220,7 +5220,7 @@ public class StringUtils { */ @Deprecated public static String removeFirst(final String text, final String regex) { - return replaceFirst(text, regex, StringUtils.EMPTY); + return replaceFirst(text, regex, EMPTY); } // Replacing @@ -6897,7 +6897,7 @@ public class StringUtils { * @return the changed String, {@code null} if null String input */ public static String swapCase(final String str) { - if (StringUtils.isEmpty(str)) { + if (isEmpty(str)) { return str; } http://git-wip-us.apache.org/repos/asf/commons-lang/blob/b610707c/src/main/java/org/apache/commons/lang3/SystemUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/SystemUtils.java b/src/main/java/org/apache/commons/lang3/SystemUtils.java index 5e9e44f..a37229b 100644 --- a/src/main/java/org/apache/commons/lang3/SystemUtils.java +++ b/src/main/java/org/apache/commons/lang3/SystemUtils.java @@ -1530,7 +1530,7 @@ public class SystemUtils { * @since 3.6 */ public static String getHostName() { - return SystemUtils.IS_OS_WINDOWS ? System.getenv("COMPUTERNAME") : System.getenv("HOSTNAME"); + return IS_OS_WINDOWS ? System.getenv("COMPUTERNAME") : System.getenv("HOSTNAME"); } /** http://git-wip-us.apache.org/repos/asf/commons-lang/blob/b610707c/src/main/java/org/apache/commons/lang3/Validate.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/Validate.java b/src/main/java/org/apache/commons/lang3/Validate.java index 0f003fd..9808990 100644 --- a/src/main/java/org/apache/commons/lang3/Validate.java +++ b/src/main/java/org/apache/commons/lang3/Validate.java @@ -506,7 +506,7 @@ public class Validate { * @see #noNullElements(Object[]) */ public static <T> T[] noNullElements(final T[] array, final String message, final Object... values) { - Validate.notNull(array); + notNull(array); for (int i = 0; i < array.length; i++) { if (array[i] == null) { final Object[] values2 = ArrayUtils.add(values, Integer.valueOf(i)); @@ -568,7 +568,7 @@ public class Validate { * @see #noNullElements(Iterable) */ public static <T extends Iterable<?>> T noNullElements(final T iterable, final String message, final Object... values) { - Validate.notNull(iterable); + notNull(iterable); int i = 0; for (final Iterator<?> it = iterable.iterator(); it.hasNext(); i++) { if (it.next() == null) { @@ -629,7 +629,7 @@ public class Validate { * @since 3.0 */ public static <T> T[] validIndex(final T[] array, final int index, final String message, final Object... values) { - Validate.notNull(array); + notNull(array); if (index < 0 || index >= array.length) { throw new IndexOutOfBoundsException(String.format(message, values)); } @@ -688,7 +688,7 @@ public class Validate { * @since 3.0 */ public static <T extends Collection<?>> T validIndex(final T collection, final int index, final String message, final Object... values) { - Validate.notNull(collection); + notNull(collection); if (index < 0 || index >= collection.size()) { throw new IndexOutOfBoundsException(String.format(message, values)); } @@ -745,7 +745,7 @@ public class Validate { * @since 3.0 */ public static <T extends CharSequence> T validIndex(final T chars, final int index, final String message, final Object... values) { - Validate.notNull(chars); + notNull(chars); if (index < 0 || index >= chars.length()) { throw new IndexOutOfBoundsException(String.format(message, values)); } http://git-wip-us.apache.org/repos/asf/commons-lang/blob/b610707c/src/main/java/org/apache/commons/lang3/builder/ToStringStyle.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/builder/ToStringStyle.java b/src/main/java/org/apache/commons/lang3/builder/ToStringStyle.java index ff10a81..d54b19c 100644 --- a/src/main/java/org/apache/commons/lang3/builder/ToStringStyle.java +++ b/src/main/java/org/apache/commons/lang3/builder/ToStringStyle.java @@ -2164,7 +2164,7 @@ public abstract class ToStringStyle implements Serializable { * @return the singleton */ private Object readResolve() { - return ToStringStyle.DEFAULT_STYLE; + return DEFAULT_STYLE; } } @@ -2198,7 +2198,7 @@ public abstract class ToStringStyle implements Serializable { * @return the singleton */ private Object readResolve() { - return ToStringStyle.NO_FIELD_NAMES_STYLE; + return NO_FIELD_NAMES_STYLE; } } @@ -2232,7 +2232,7 @@ public abstract class ToStringStyle implements Serializable { * @return the singleton */ private Object readResolve() { - return ToStringStyle.SHORT_PREFIX_STYLE; + return SHORT_PREFIX_STYLE; } } @@ -2269,7 +2269,7 @@ public abstract class ToStringStyle implements Serializable { * @return the singleton */ private Object readResolve() { - return ToStringStyle.SIMPLE_STYLE; + return SIMPLE_STYLE; } } @@ -2305,7 +2305,7 @@ public abstract class ToStringStyle implements Serializable { * @return the singleton */ private Object readResolve() { - return ToStringStyle.MULTI_LINE_STYLE; + return MULTI_LINE_STYLE; } } @@ -2340,7 +2340,7 @@ public abstract class ToStringStyle implements Serializable { * @return the singleton */ private Object readResolve() { - return ToStringStyle.NO_CLASS_NAME_STYLE; + return NO_CLASS_NAME_STYLE; } } @@ -2631,7 +2631,7 @@ public abstract class ToStringStyle implements Serializable { * @return the singleton */ private Object readResolve() { - return ToStringStyle.JSON_STYLE; + return JSON_STYLE; } } http://git-wip-us.apache.org/repos/asf/commons-lang/blob/b610707c/src/main/java/org/apache/commons/lang3/exception/ExceptionUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/exception/ExceptionUtils.java b/src/main/java/org/apache/commons/lang3/exception/ExceptionUtils.java index bacb859..16b26ed 100644 --- a/src/main/java/org/apache/commons/lang3/exception/ExceptionUtils.java +++ b/src/main/java/org/apache/commons/lang3/exception/ExceptionUtils.java @@ -389,7 +389,7 @@ public class ExceptionUtils { if (fromIndex < 0) { fromIndex = 0; } - final Throwable[] throwables = ExceptionUtils.getThrowables(throwable); + final Throwable[] throwables = getThrowables(throwable); if (fromIndex >= throwables.length) { return -1; } @@ -682,7 +682,7 @@ public class ExceptionUtils { * @since 2.2 */ public static String getRootCauseMessage(final Throwable th) { - Throwable root = ExceptionUtils.getRootCause(th); + Throwable root = getRootCause(th); root = root == null ? th : root; return getMessage(root); } http://git-wip-us.apache.org/repos/asf/commons-lang/blob/b610707c/src/main/java/org/apache/commons/lang3/math/Fraction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/math/Fraction.java b/src/main/java/org/apache/commons/lang3/math/Fraction.java index e849dcd..a6ef8b3 100644 --- a/src/main/java/org/apache/commons/lang3/math/Fraction.java +++ b/src/main/java/org/apache/commons/lang3/math/Fraction.java @@ -465,7 +465,7 @@ public final class Fraction extends Number implements Comparable<Fraction> { if (gcd == 1) { return this; } - return Fraction.getFraction(numerator / gcd, denominator / gcd); + return getFraction(numerator / gcd, denominator / gcd); } /** http://git-wip-us.apache.org/repos/asf/commons-lang/blob/b610707c/src/main/java/org/apache/commons/lang3/math/NumberUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/math/NumberUtils.java b/src/main/java/org/apache/commons/lang3/math/NumberUtils.java index ff5552d..63dd8b3 100644 --- a/src/main/java/org/apache/commons/lang3/math/NumberUtils.java +++ b/src/main/java/org/apache/commons/lang3/math/NumberUtils.java @@ -539,7 +539,7 @@ public class NumberUtils { case 'f' : case 'F' : try { - final Float f = NumberUtils.createFloat(str); + final Float f = createFloat(str); if (!(f.isInfinite() || f.floatValue() == 0.0F && !allZeros)) { //If it's too big for a float or the float value = 0 and the string //has non-zeros in it, then float does not have the precision we want @@ -553,7 +553,7 @@ public class NumberUtils { case 'd' : case 'D' : try { - final Double d = NumberUtils.createDouble(str); + final Double d = createDouble(str); if (!(d.isInfinite() || d.floatValue() == 0.0D && !allZeros)) { return d; } http://git-wip-us.apache.org/repos/asf/commons-lang/blob/b610707c/src/main/java/org/apache/commons/lang3/reflect/MemberUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/reflect/MemberUtils.java b/src/main/java/org/apache/commons/lang3/reflect/MemberUtils.java index 9523858..751e5e0 100644 --- a/src/main/java/org/apache/commons/lang3/reflect/MemberUtils.java +++ b/src/main/java/org/apache/commons/lang3/reflect/MemberUtils.java @@ -246,11 +246,11 @@ abstract class MemberUtils { } static boolean isMatchingMethod(final Method method, final Class<?>[] parameterTypes) { - return MemberUtils.isMatchingExecutable(Executable.of(method), parameterTypes); + return isMatchingExecutable(Executable.of(method), parameterTypes); } static boolean isMatchingConstructor(final Constructor<?> method, final Class<?>[] parameterTypes) { - return MemberUtils.isMatchingExecutable(Executable.of(method), parameterTypes); + return isMatchingExecutable(Executable.of(method), parameterTypes); } private static boolean isMatchingExecutable(final Executable method, final Class<?>[] parameterTypes) { http://git-wip-us.apache.org/repos/asf/commons-lang/blob/b610707c/src/main/java/org/apache/commons/lang3/reflect/TypeUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/reflect/TypeUtils.java b/src/main/java/org/apache/commons/lang3/reflect/TypeUtils.java index a421d5c..037c3a4 100644 --- a/src/main/java/org/apache/commons/lang3/reflect/TypeUtils.java +++ b/src/main/java/org/apache/commons/lang3/reflect/TypeUtils.java @@ -1378,7 +1378,7 @@ public class TypeUtils { parameterizedTypeArguments = typeArguments; } else { parameterizedTypeArguments = new HashMap<>(typeArguments); - parameterizedTypeArguments.putAll(TypeUtils.getTypeArguments(p)); + parameterizedTypeArguments.putAll(getTypeArguments(p)); } final Type[] args = p.getActualTypeArguments(); for (int i = 0; i < args.length; i++) { @@ -1444,8 +1444,8 @@ public class TypeUtils { } if (type instanceof WildcardType) { final WildcardType wild = (WildcardType) type; - return containsTypeVariables(TypeUtils.getImplicitLowerBounds(wild)[0]) - || containsTypeVariables(TypeUtils.getImplicitUpperBounds(wild)[0]); + return containsTypeVariables(getImplicitLowerBounds(wild)[0]) + || containsTypeVariables(getImplicitUpperBounds(wild)[0]); } return false; } @@ -1497,7 +1497,7 @@ public class TypeUtils { } else if (owner == null) { useOwner = raw.getEnclosingClass(); } else { - Validate.isTrue(TypeUtils.isAssignable(owner, raw.getEnclosingClass()), + Validate.isTrue(isAssignable(owner, raw.getEnclosingClass()), "%s is invalid owner type for parameterized %s", owner, raw); useOwner = owner; } @@ -1732,7 +1732,7 @@ public class TypeUtils { * @since 3.2 */ public static <T> Typed<T> wrap(final Class<T> type) { - return TypeUtils.wrap((Type) type); + return wrap((Type) type); } /** http://git-wip-us.apache.org/repos/asf/commons-lang/blob/b610707c/src/main/java/org/apache/commons/lang3/text/StrSubstitutor.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/text/StrSubstitutor.java b/src/main/java/org/apache/commons/lang3/text/StrSubstitutor.java index db5ed0a..49804a2 100644 --- a/src/main/java/org/apache/commons/lang3/text/StrSubstitutor.java +++ b/src/main/java/org/apache/commons/lang3/text/StrSubstitutor.java @@ -225,7 +225,7 @@ public class StrSubstitutor { final String propValue = valueProperties.getProperty(propName); valueMap.put(propName, propValue); } - return StrSubstitutor.replace(source, valueMap); + return replace(source, valueMap); } /** http://git-wip-us.apache.org/repos/asf/commons-lang/blob/b610707c/src/main/java/org/apache/commons/lang3/time/DateUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/time/DateUtils.java b/src/main/java/org/apache/commons/lang3/time/DateUtils.java index 9d708c3..e917bf9 100644 --- a/src/main/java/org/apache/commons/lang3/time/DateUtils.java +++ b/src/main/java/org/apache/commons/lang3/time/DateUtils.java @@ -88,7 +88,7 @@ public class DateUtils { {Calendar.DATE, Calendar.DAY_OF_MONTH, Calendar.AM_PM /* Calendar.DAY_OF_YEAR, Calendar.DAY_OF_WEEK, Calendar.DAY_OF_WEEK_IN_MONTH */ }, - {Calendar.MONTH, DateUtils.SEMI_MONTH}, + {Calendar.MONTH, SEMI_MONTH}, {Calendar.YEAR}, {Calendar.ERA}}; @@ -1011,7 +1011,7 @@ public class DateUtils { if (element == field) { //This is our field... we stop looping if (modType == ModifyType.CEILING || modType == ModifyType.ROUND && roundUp) { - if (field == DateUtils.SEMI_MONTH) { + if (field == SEMI_MONTH) { //This is a special case that's hard to generalize //If the date is 1, we round up to 16, otherwise // we subtract 15 days and add 1 month @@ -1047,7 +1047,7 @@ public class DateUtils { boolean offsetSet = false; //These are special types of fields that require different rounding rules switch (field) { - case DateUtils.SEMI_MONTH: + case SEMI_MONTH: if (aField[0] == Calendar.DATE) { //If we're going to drop the DATE field's value, // we want to do this our own way. http://git-wip-us.apache.org/repos/asf/commons-lang/blob/b610707c/src/main/java/org/apache/commons/lang3/time/FastDatePrinter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/time/FastDatePrinter.java b/src/main/java/org/apache/commons/lang3/time/FastDatePrinter.java index 6a392d2..df7af4e 100644 --- a/src/main/java/org/apache/commons/lang3/time/FastDatePrinter.java +++ b/src/main/java/org/apache/commons/lang3/time/FastDatePrinter.java @@ -1454,11 +1454,11 @@ public class FastDatePrinter implements DatePrinter, Serializable { static Iso8601_Rule getRule(final int tokenLen) { switch(tokenLen) { case 1: - return Iso8601_Rule.ISO8601_HOURS; + return ISO8601_HOURS; case 2: - return Iso8601_Rule.ISO8601_HOURS_MINUTES; + return ISO8601_HOURS_MINUTES; case 3: - return Iso8601_Rule.ISO8601_HOURS_COLON_MINUTES; + return ISO8601_HOURS_COLON_MINUTES; default: throw new IllegalArgumentException("invalid number of X"); } http://git-wip-us.apache.org/repos/asf/commons-lang/blob/b610707c/src/main/java/org/apache/commons/lang3/tuple/ImmutablePair.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/tuple/ImmutablePair.java b/src/main/java/org/apache/commons/lang3/tuple/ImmutablePair.java index 7c865ad..8ef18f3 100644 --- a/src/main/java/org/apache/commons/lang3/tuple/ImmutablePair.java +++ b/src/main/java/org/apache/commons/lang3/tuple/ImmutablePair.java @@ -38,7 +38,7 @@ public final class ImmutablePair<L, R> extends Pair<L, R> { */ // This is not defined with generics to avoid warnings in call sites. @SuppressWarnings("rawtypes") - private static final ImmutablePair NULL = ImmutablePair.of(null, null); + private static final ImmutablePair NULL = of(null, null); /** Serialization version */ private static final long serialVersionUID = 4954918890077093841L; http://git-wip-us.apache.org/repos/asf/commons-lang/blob/b610707c/src/main/java/org/apache/commons/lang3/tuple/ImmutableTriple.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/tuple/ImmutableTriple.java b/src/main/java/org/apache/commons/lang3/tuple/ImmutableTriple.java index 3fd152b..f73bc03 100644 --- a/src/main/java/org/apache/commons/lang3/tuple/ImmutableTriple.java +++ b/src/main/java/org/apache/commons/lang3/tuple/ImmutableTriple.java @@ -39,7 +39,7 @@ public final class ImmutableTriple<L, M, R> extends Triple<L, M, R> { */ // This is not defined with generics to avoid warnings in call sites. @SuppressWarnings("rawtypes") - private static final ImmutableTriple NULL = ImmutableTriple.of(null, null, null); + private static final ImmutableTriple NULL = of(null, null, null); /** Serialization version */ private static final long serialVersionUID = 1L;
