Remove redundant type arguments. Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-lang/commit/4f82195a Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/4f82195a Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/4f82195a
Branch: refs/heads/master Commit: 4f82195afdc4279c05826fc20f8642bfdaaafec3 Parents: 7e8df32 Author: Gary Gregory <ggreg...@apache.org> Authored: Sun Oct 23 10:52:50 2016 -0700 Committer: Gary Gregory <ggreg...@apache.org> Committed: Sun Oct 23 10:52:50 2016 -0700 ---------------------------------------------------------------------- .../org/apache/commons/lang3/ArrayUtils.java | 20 ++++++------ .../org/apache/commons/lang3/ClassUtils.java | 26 ++++++++-------- .../org/apache/commons/lang3/EnumUtils.java | 4 +-- .../org/apache/commons/lang3/LocaleUtils.java | 14 ++++----- .../org/apache/commons/lang3/ObjectUtils.java | 6 ++-- .../java/org/apache/commons/lang3/Range.java | 2 +- .../commons/lang3/SerializationUtils.java | 2 +- .../org/apache/commons/lang3/StringUtils.java | 10 +++--- .../org/apache/commons/lang3/ThreadUtils.java | 6 ++-- .../commons/lang3/builder/DiffBuilder.java | 2 +- .../commons/lang3/builder/EqualsBuilder.java | 4 +-- .../commons/lang3/builder/HashCodeBuilder.java | 4 +-- .../builder/ReflectionToStringBuilder.java | 2 +- .../commons/lang3/builder/ToStringStyle.java | 4 +-- .../concurrent/AbstractCircuitBreaker.java | 2 +- .../lang3/concurrent/AtomicInitializer.java | 2 +- .../lang3/concurrent/AtomicSafeInitializer.java | 4 +-- .../lang3/concurrent/ConcurrentUtils.java | 2 +- .../concurrent/EventCountCircuitBreaker.java | 4 +-- .../concurrent/MultiBackgroundInitializer.java | 8 ++--- .../lang3/event/EventListenerSupport.java | 8 ++--- .../apache/commons/lang3/event/EventUtils.java | 2 +- .../exception/DefaultExceptionContext.java | 8 ++--- .../commons/lang3/exception/ExceptionUtils.java | 8 ++--- .../commons/lang3/reflect/FieldUtils.java | 4 +-- .../commons/lang3/reflect/MethodUtils.java | 4 +-- .../apache/commons/lang3/reflect/TypeUtils.java | 10 +++--- .../lang3/text/ExtendedMessageFormat.java | 4 +-- .../apache/commons/lang3/text/StrLookup.java | 4 +-- .../commons/lang3/text/StrSubstitutor.java | 4 +-- .../apache/commons/lang3/text/StrTokenizer.java | 4 +-- .../lang3/text/translate/LookupTranslator.java | 4 +-- .../commons/lang3/time/DurationFormatUtils.java | 2 +- .../commons/lang3/time/FastDateParser.java | 12 ++++---- .../commons/lang3/time/FastDatePrinter.java | 4 +-- .../apache/commons/lang3/time/FormatCache.java | 4 +-- .../commons/lang3/tuple/ImmutablePair.java | 2 +- .../commons/lang3/tuple/ImmutableTriple.java | 2 +- .../apache/commons/lang3/tuple/MutablePair.java | 2 +- .../commons/lang3/tuple/MutableTriple.java | 2 +- .../org/apache/commons/lang3/tuple/Pair.java | 2 +- .../org/apache/commons/lang3/tuple/Triple.java | 2 +- .../apache/commons/lang3/ClassUtilsTest.java | 8 ++--- .../commons/lang3/HashSetvBitSetTest.java | 2 +- .../apache/commons/lang3/LocaleUtilsTest.java | 2 +- .../apache/commons/lang3/ObjectUtilsTest.java | 2 +- .../commons/lang3/SerializationUtilsTest.java | 2 +- .../org/apache/commons/lang3/ValidateTest.java | 16 +++++----- .../lang3/builder/DefaultToStringStyleTest.java | 8 ++--- .../lang3/builder/JsonToStringStyleTest.java | 8 ++--- .../builder/MultiLineToStringStyleTest.java | 8 ++--- .../MultilineRecursiveToStringStyleTest.java | 2 +- .../builder/NoClassNameToStringStyleTest.java | 8 ++--- .../builder/NoFieldNamesToStringStyleTest.java | 8 ++--- .../builder/RecursiveToStringStyleTest.java | 8 ++--- ...eflectionToStringBuilderConcurrencyTest.java | 2 +- .../ReflectionToStringBuilderExcludeTest.java | 6 ++-- ...ringBuilderMutateInspectConcurrencyTest.java | 2 +- .../builder/ShortPrefixToStringStyleTest.java | 8 ++--- .../lang3/builder/SimpleToStringStyleTest.java | 8 ++--- .../builder/StandardToStringStyleTest.java | 8 ++--- .../lang3/builder/ToStringBuilderTest.java | 18 +++++------ .../builder/ToStringStyleConcurrencyTest.java | 4 +-- .../concurrent/BackgroundInitializerTest.java | 2 +- .../CallableBackgroundInitializerTest.java | 6 ++-- .../lang3/concurrent/ConcurrentUtilsTest.java | 14 ++++----- .../concurrent/ConstantInitializerTest.java | 16 +++++----- .../EventCountCircuitBreakerTest.java | 2 +- .../lang3/event/EventListenerSupportTest.java | 2 +- .../commons/lang3/event/EventUtilsTest.java | 2 +- .../lang3/mutable/MutableObjectTest.java | 32 ++++++++++---------- .../lang3/reflect/ConstructorUtilsTest.java | 2 +- .../commons/lang3/reflect/FieldUtilsTest.java | 2 +- .../commons/lang3/reflect/MethodUtilsTest.java | 2 +- .../commons/lang3/reflect/TypeUtilsTest.java | 2 +- .../lang3/text/ExtendedMessageFormatTest.java | 4 +-- .../commons/lang3/text/StrLookupTest.java | 2 +- .../commons/lang3/text/StrSubstitutorTest.java | 22 +++++++------- .../lang3/text/translate/EntityArraysTest.java | 8 ++--- .../commons/lang3/time/FastDateParserTest.java | 2 +- .../time/FastDatePrinterTimeZonesTest.java | 2 +- .../commons/lang3/tuple/ImmutablePairTest.java | 4 +-- .../lang3/tuple/ImmutableTripleTest.java | 4 +-- .../commons/lang3/tuple/MutablePairTest.java | 8 ++--- .../commons/lang3/tuple/MutableTripleTest.java | 8 ++--- .../apache/commons/lang3/tuple/PairTest.java | 4 +-- .../apache/commons/lang3/tuple/TripleTest.java | 2 +- 87 files changed, 259 insertions(+), 259 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4f82195a/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 f42a498..3ba98e5 100644 --- a/src/main/java/org/apache/commons/lang3/ArrayUtils.java +++ b/src/main/java/org/apache/commons/lang3/ArrayUtils.java @@ -239,7 +239,7 @@ public class ArrayUtils { if (array == null) { return null; } - final Map<Object, Object> map = new HashMap<Object, Object>((int) (array.length * 1.5)); + final Map<Object, Object> map = new HashMap<>((int) (array.length * 1.5)); for (int i = 0; i < array.length; i++) { final Object object = array[i]; if (object instanceof Map.Entry<?, ?>) { @@ -6611,7 +6611,7 @@ public class ArrayUtils { if (isEmpty(array) || isEmpty(values)) { return clone(array); } - final HashMap<T, MutableInt> occurrences = new HashMap<T, MutableInt>(values.length); + final HashMap<T, MutableInt> occurrences = new HashMap<>(values.length); for (final T v : values) { final MutableInt count = occurrences.get(v); if (count == null) { @@ -6701,7 +6701,7 @@ public class ArrayUtils { if (isEmpty(array) || isEmpty(values)) { return clone(array); } - final Map<Byte, MutableInt> occurrences = new HashMap<Byte, MutableInt>(values.length); + final Map<Byte, MutableInt> occurrences = new HashMap<>(values.length); for (final byte v : values) { final Byte boxed = Byte.valueOf(v); final MutableInt count = occurrences.get(boxed); @@ -6789,7 +6789,7 @@ public class ArrayUtils { if (isEmpty(array) || isEmpty(values)) { return clone(array); } - final HashMap<Short, MutableInt> occurrences = new HashMap<Short, MutableInt>(values.length); + final HashMap<Short, MutableInt> occurrences = new HashMap<>(values.length); for (final short v : values) { final Short boxed = Short.valueOf(v); final MutableInt count = occurrences.get(boxed); @@ -6877,7 +6877,7 @@ public class ArrayUtils { if (isEmpty(array) || isEmpty(values)) { return clone(array); } - final HashMap<Integer, MutableInt> occurrences = new HashMap<Integer, MutableInt>(values.length); + final HashMap<Integer, MutableInt> occurrences = new HashMap<>(values.length); for (final int v : values) { final Integer boxed = Integer.valueOf(v); final MutableInt count = occurrences.get(boxed); @@ -6965,7 +6965,7 @@ public class ArrayUtils { if (isEmpty(array) || isEmpty(values)) { return clone(array); } - final HashMap<Character, MutableInt> occurrences = new HashMap<Character, MutableInt>(values.length); + final HashMap<Character, MutableInt> occurrences = new HashMap<>(values.length); for (final char v : values) { final Character boxed = Character.valueOf(v); final MutableInt count = occurrences.get(boxed); @@ -7053,7 +7053,7 @@ public class ArrayUtils { if (isEmpty(array) || isEmpty(values)) { return clone(array); } - final HashMap<Long, MutableInt> occurrences = new HashMap<Long, MutableInt>(values.length); + final HashMap<Long, MutableInt> occurrences = new HashMap<>(values.length); for (final long v : values) { final Long boxed = Long.valueOf(v); final MutableInt count = occurrences.get(boxed); @@ -7141,7 +7141,7 @@ public class ArrayUtils { if (isEmpty(array) || isEmpty(values)) { return clone(array); } - final HashMap<Float, MutableInt> occurrences = new HashMap<Float, MutableInt>(values.length); + final HashMap<Float, MutableInt> occurrences = new HashMap<>(values.length); for (final float v : values) { final Float boxed = Float.valueOf(v); final MutableInt count = occurrences.get(boxed); @@ -7229,7 +7229,7 @@ public class ArrayUtils { if (isEmpty(array) || isEmpty(values)) { return clone(array); } - final HashMap<Double, MutableInt> occurrences = new HashMap<Double, MutableInt>(values.length); + final HashMap<Double, MutableInt> occurrences = new HashMap<>(values.length); for (final double v : values) { final Double boxed = Double.valueOf(v); final MutableInt count = occurrences.get(boxed); @@ -7313,7 +7313,7 @@ public class ArrayUtils { if (isEmpty(array) || isEmpty(values)) { return clone(array); } - final HashMap<Boolean, MutableInt> occurrences = new HashMap<Boolean, MutableInt>(2); // only two possible values here + final HashMap<Boolean, MutableInt> occurrences = new HashMap<>(2); // only two possible values here for (final boolean v : values) { final Boolean boxed = Boolean.valueOf(v); final MutableInt count = occurrences.get(boxed); http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4f82195a/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 da2a7b2..465990e 100644 --- a/src/main/java/org/apache/commons/lang3/ClassUtils.java +++ b/src/main/java/org/apache/commons/lang3/ClassUtils.java @@ -75,7 +75,7 @@ public class ClassUtils { /** * Maps names of primitives to their corresponding primitive {@code Class}es. */ - private static final Map<String, Class<?>> namePrimitiveMap = new HashMap<String, Class<?>>(); + private static final Map<String, Class<?>> namePrimitiveMap = new HashMap<>(); static { namePrimitiveMap.put("boolean", Boolean.TYPE); namePrimitiveMap.put("byte", Byte.TYPE); @@ -91,7 +91,7 @@ public class ClassUtils { /** * Maps primitive {@code Class}es to their corresponding wrapper {@code Class}. */ - private static final Map<Class<?>, Class<?>> primitiveWrapperMap = new HashMap<Class<?>, Class<?>>(); + private static final Map<Class<?>, Class<?>> primitiveWrapperMap = new HashMap<>(); static { primitiveWrapperMap.put(Boolean.TYPE, Boolean.class); primitiveWrapperMap.put(Byte.TYPE, Byte.class); @@ -107,7 +107,7 @@ public class ClassUtils { /** * Maps wrapper {@code Class}es to their corresponding primitive types. */ - private static final Map<Class<?>, Class<?>> wrapperPrimitiveMap = new HashMap<Class<?>, Class<?>>(); + private static final Map<Class<?>, Class<?>> wrapperPrimitiveMap = new HashMap<>(); static { for (final Map.Entry<Class<?>, Class<?>> entry : primitiveWrapperMap.entrySet()) { final Class<?> primitiveClass = entry.getKey(); @@ -132,7 +132,7 @@ public class ClassUtils { * Feed abbreviation maps */ static { - final Map<String, String> m = new HashMap<String, String>(); + final Map<String, String> m = new HashMap<>(); m.put("int", "I"); m.put("boolean", "Z"); m.put("float", "F"); @@ -141,7 +141,7 @@ public class ClassUtils { m.put("byte", "B"); m.put("double", "D"); m.put("char", "C"); - final Map<String, String> r = new HashMap<String, String>(); + final Map<String, String> r = new HashMap<>(); for (final Map.Entry<String, String> e : m.entrySet()) { r.put(e.getValue(), e.getKey()); } @@ -423,7 +423,7 @@ public class ClassUtils { if (cls == null) { return null; } - final List<Class<?>> classes = new ArrayList<Class<?>>(); + final List<Class<?>> classes = new ArrayList<>(); Class<?> superclass = cls.getSuperclass(); while (superclass != null) { classes.add(superclass); @@ -450,10 +450,10 @@ public class ClassUtils { return null; } - final LinkedHashSet<Class<?>> interfacesFound = new LinkedHashSet<Class<?>>(); + final LinkedHashSet<Class<?>> interfacesFound = new LinkedHashSet<>(); getAllInterfaces(cls, interfacesFound); - return new ArrayList<Class<?>>(interfacesFound); + return new ArrayList<>(interfacesFound); } /** @@ -494,7 +494,7 @@ public class ClassUtils { if (classNames == null) { return null; } - final List<Class<?>> classes = new ArrayList<Class<?>>(classNames.size()); + final List<Class<?>> classes = new ArrayList<>(classNames.size()); for (final String className : classNames) { try { classes.add(Class.forName(className)); @@ -521,7 +521,7 @@ public class ClassUtils { if (classes == null) { return null; } - final List<String> classNames = new ArrayList<String>(classes.size()); + final List<String> classNames = new ArrayList<>(classes.size()); for (final Class<?> cls : classes) { if (cls == null) { classNames.add(null); @@ -1021,7 +1021,7 @@ public class ClassUtils { return declaredMethod; } - final List<Class<?>> candidateClasses = new ArrayList<Class<?>>(); + final List<Class<?>> candidateClasses = new ArrayList<>(); candidateClasses.addAll(getAllInterfaces(cls)); candidateClasses.addAll(getAllSuperclasses(cls)); @@ -1287,7 +1287,7 @@ public class ClassUtils { @Override public Iterator<Class<?>> iterator() { - final Set<Class<?>> seenInterfaces = new HashSet<Class<?>>(); + final Set<Class<?>> seenInterfaces = new HashSet<>(); final Iterator<Class<?>> wrapped = classes.iterator(); return new Iterator<Class<?>>() { @@ -1306,7 +1306,7 @@ public class ClassUtils { return nextInterface; } final Class<?> nextSuperclass = wrapped.next(); - final Set<Class<?>> currentInterfaces = new LinkedHashSet<Class<?>>(); + final Set<Class<?>> currentInterfaces = new LinkedHashSet<>(); walkInterfaces(currentInterfaces, nextSuperclass); interfaces = currentInterfaces.iterator(); return nextSuperclass; http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4f82195a/src/main/java/org/apache/commons/lang3/EnumUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/EnumUtils.java b/src/main/java/org/apache/commons/lang3/EnumUtils.java index 699a215..8280bf8 100644 --- a/src/main/java/org/apache/commons/lang3/EnumUtils.java +++ b/src/main/java/org/apache/commons/lang3/EnumUtils.java @@ -55,7 +55,7 @@ public class EnumUtils { * @return the modifiable map of enum names to enums, never null */ public static <E extends Enum<E>> Map<String, E> getEnumMap(final Class<E> enumClass) { - final Map<String, E> map = new LinkedHashMap<String, E>(); + final Map<String, E> map = new LinkedHashMap<>(); for (final E e: enumClass.getEnumConstants()) { map.put(e.name(), e); } @@ -72,7 +72,7 @@ public class EnumUtils { * @return the modifiable list of enums, never null */ public static <E extends Enum<E>> List<E> getEnumList(final Class<E> enumClass) { - return new ArrayList<E>(Arrays.asList(enumClass.getEnumConstants())); + return new ArrayList<>(Arrays.asList(enumClass.getEnumConstants())); } /** http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4f82195a/src/main/java/org/apache/commons/lang3/LocaleUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/LocaleUtils.java b/src/main/java/org/apache/commons/lang3/LocaleUtils.java index 4185373..a3126eb 100644 --- a/src/main/java/org/apache/commons/lang3/LocaleUtils.java +++ b/src/main/java/org/apache/commons/lang3/LocaleUtils.java @@ -39,11 +39,11 @@ public class LocaleUtils { /** Concurrent map of language locales by country. */ private static final ConcurrentMap<String, List<Locale>> cLanguagesByCountry = - new ConcurrentHashMap<String, List<Locale>>(); + new ConcurrentHashMap<>(); /** Concurrent map of country locales by language. */ private static final ConcurrentMap<String, List<Locale>> cCountriesByLanguage = - new ConcurrentHashMap<String, List<Locale>>(); + new ConcurrentHashMap<>(); /** * <p>{@code LocaleUtils} instances should NOT be constructed in standard programming. @@ -189,7 +189,7 @@ public class LocaleUtils { * @return the unmodifiable list of Locale objects, 0 being locale, not null */ public static List<Locale> localeLookupList(final Locale locale, final Locale defaultLocale) { - final List<Locale> list = new ArrayList<Locale>(4); + final List<Locale> list = new ArrayList<>(4); if (locale != null) { list.add(locale); if (locale.getVariant().length() > 0) { @@ -260,7 +260,7 @@ public class LocaleUtils { } List<Locale> langs = cLanguagesByCountry.get(countryCode); if (langs == null) { - langs = new ArrayList<Locale>(); + langs = new ArrayList<>(); final List<Locale> locales = availableLocaleList(); for (int i = 0; i < locales.size(); i++) { final Locale locale = locales.get(i); @@ -292,7 +292,7 @@ public class LocaleUtils { } List<Locale> countries = cCountriesByLanguage.get(languageCode); if (countries == null) { - countries = new ArrayList<Locale>(); + countries = new ArrayList<>(); final List<Locale> locales = availableLocaleList(); for (int i = 0; i < locales.size(); i++) { final Locale locale = locales.get(i); @@ -318,9 +318,9 @@ public class LocaleUtils { private static final Set<Locale> AVAILABLE_LOCALE_SET; static { - final List<Locale> list = new ArrayList<Locale>(Arrays.asList(Locale.getAvailableLocales())); // extra safe + final List<Locale> list = new ArrayList<>(Arrays.asList(Locale.getAvailableLocales())); // extra safe AVAILABLE_LOCALE_LIST = Collections.unmodifiableList(list); - AVAILABLE_LOCALE_SET = Collections.unmodifiableSet(new HashSet<Locale>(list)); + AVAILABLE_LOCALE_SET = Collections.unmodifiableSet(new HashSet<>(list)); } } http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4f82195a/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 d328105..84b4b10 100644 --- a/src/main/java/org/apache/commons/lang3/ObjectUtils.java +++ b/src/main/java/org/apache/commons/lang3/ObjectUtils.java @@ -586,7 +586,7 @@ public class ObjectUtils { public static <T extends Comparable<? super T>> T median(final T... items) { Validate.notEmpty(items); Validate.noNullElements(items); - final TreeSet<T> sort = new TreeSet<T>(); + final TreeSet<T> sort = new TreeSet<>(); Collections.addAll(sort, items); @SuppressWarnings("unchecked") //we know all items added were T instances final @@ -609,7 +609,7 @@ public class ObjectUtils { Validate.notEmpty(items, "null/empty items"); Validate.noNullElements(items); Validate.notNull(comparator, "null comparator"); - final TreeSet<T> sort = new TreeSet<T>(comparator); + final TreeSet<T> sort = new TreeSet<>(comparator); Collections.addAll(sort, items); @SuppressWarnings("unchecked") //we know all items added were T instances final @@ -629,7 +629,7 @@ public class ObjectUtils { */ public static <T> T mode(final T... items) { if (ArrayUtils.isNotEmpty(items)) { - final HashMap<T, MutableInt> occurrences = new HashMap<T, MutableInt>(items.length); + final HashMap<T, MutableInt> occurrences = new HashMap<>(items.length); for (final T t : items) { final MutableInt count = occurrences.get(t); if (count == null) { http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4f82195a/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 40afba8..73e6969 100644 --- a/src/main/java/org/apache/commons/lang3/Range.java +++ b/src/main/java/org/apache/commons/lang3/Range.java @@ -131,7 +131,7 @@ public final class Range<T> implements Serializable { * @throws ClassCastException if using natural ordering and the elements are not {@code Comparable} */ public static <T> Range<T> between(final T fromInclusive, final T toInclusive, final Comparator<T> comparator) { - return new Range<T>(fromInclusive, toInclusive, comparator); + return new Range<>(fromInclusive, toInclusive, comparator); } /** http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4f82195a/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 a5a7b49..9e60e69 100644 --- a/src/main/java/org/apache/commons/lang3/SerializationUtils.java +++ b/src/main/java/org/apache/commons/lang3/SerializationUtils.java @@ -280,7 +280,7 @@ public class SerializationUtils { */ static class ClassLoaderAwareObjectInputStream extends ObjectInputStream { private static final Map<String, Class<?>> primitiveTypes = - new HashMap<String, Class<?>>(); + new HashMap<>(); static { primitiveTypes.put("byte", byte.class); http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4f82195a/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 8405a9f..b911af1 100644 --- a/src/main/java/org/apache/commons/lang3/StringUtils.java +++ b/src/main/java/org/apache/commons/lang3/StringUtils.java @@ -3002,7 +3002,7 @@ public class StringUtils { } final int closeLen = close.length(); final int openLen = open.length(); - final List<String> list = new ArrayList<String>(); + final List<String> list = new ArrayList<>(); int pos = 0; while (pos < strLen - closeLen) { int start = str.indexOf(open, pos); @@ -3298,7 +3298,7 @@ public class StringUtils { final int separatorLength = separator.length(); - final ArrayList<String> substrings = new ArrayList<String>(); + final ArrayList<String> substrings = new ArrayList<>(); int numberOfSubstrings = 0; int beg = 0; int end = 0; @@ -3432,7 +3432,7 @@ public class StringUtils { if (len == 0) { return ArrayUtils.EMPTY_STRING_ARRAY; } - final List<String> list = new ArrayList<String>(); + final List<String> list = new ArrayList<>(); int i = 0, start = 0; boolean match = false; boolean lastMatch = false; @@ -3559,7 +3559,7 @@ public class StringUtils { if (len == 0) { return ArrayUtils.EMPTY_STRING_ARRAY; } - final List<String> list = new ArrayList<String>(); + final List<String> list = new ArrayList<>(); int sizePlus1 = 1; int i = 0, start = 0; boolean match = false; @@ -3705,7 +3705,7 @@ public class StringUtils { return ArrayUtils.EMPTY_STRING_ARRAY; } final char[] c = str.toCharArray(); - final List<String> list = new ArrayList<String>(); + final List<String> list = new ArrayList<>(); int tokenStart = 0; int currentType = Character.getType(c[tokenStart]); for (int pos = tokenStart + 1; pos < c.length; pos++) { http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4f82195a/src/main/java/org/apache/commons/lang3/ThreadUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/ThreadUtils.java b/src/main/java/org/apache/commons/lang3/ThreadUtils.java index 89a59ce..93a48b7 100644 --- a/src/main/java/org/apache/commons/lang3/ThreadUtils.java +++ b/src/main/java/org/apache/commons/lang3/ThreadUtils.java @@ -131,7 +131,7 @@ public class ThreadUtils { return Collections.emptyList(); } - final Collection<Thread> result = new ArrayList<Thread>(); + final Collection<Thread> result = new ArrayList<>(); final NamePredicate threadNamePredicate = new NamePredicate(threadName); for(final ThreadGroup group : threadGroups) { result.addAll(findThreads(group, false, threadNamePredicate)); @@ -413,7 +413,7 @@ public class ThreadUtils { //return value of enumerate() must be strictly less than the array size according to javadoc } while (count >= threads.length); - final List<Thread> result = new ArrayList<Thread>(count); + final List<Thread> result = new ArrayList<>(count); for (int i = 0; i < count; ++i) { if (predicate.test(threads[i])) { result.add(threads[i]); @@ -449,7 +449,7 @@ public class ThreadUtils { //return value of enumerate() must be strictly less than the array size according to javadoc } while(count >= threadGroups.length); - final List<ThreadGroup> result = new ArrayList<ThreadGroup>(count); + final List<ThreadGroup> result = new ArrayList<>(count); for(int i = 0; i < count; ++i) { if(predicate.test(threadGroups[i])) { result.add(threadGroups[i]); http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4f82195a/src/main/java/org/apache/commons/lang3/builder/DiffBuilder.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/builder/DiffBuilder.java b/src/main/java/org/apache/commons/lang3/builder/DiffBuilder.java index 6858952..e9804d5 100644 --- a/src/main/java/org/apache/commons/lang3/builder/DiffBuilder.java +++ b/src/main/java/org/apache/commons/lang3/builder/DiffBuilder.java @@ -109,7 +109,7 @@ public class DiffBuilder implements Builder<DiffResult> { throw new IllegalArgumentException("rhs cannot be null"); } - this.diffs = new ArrayList<Diff<?>>(); + this.diffs = new ArrayList<>(); this.left = lhs; this.right = rhs; this.style = style; http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4f82195a/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java b/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java index 502f055..c25e928 100644 --- a/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java +++ b/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java @@ -92,7 +92,7 @@ public class EqualsBuilder implements Builder<Boolean> { * * @since 3.0 */ - private static final ThreadLocal<Set<Pair<IDKey, IDKey>>> REGISTRY = new ThreadLocal<Set<Pair<IDKey, IDKey>>>(); + private static final ThreadLocal<Set<Pair<IDKey, IDKey>>> REGISTRY = new ThreadLocal<>(); /* * NOTE: we cannot store the actual objects in a HashSet, as that would use the very hashCode() @@ -174,7 +174,7 @@ public class EqualsBuilder implements Builder<Boolean> { private static void register(final Object lhs, final Object rhs) { Set<Pair<IDKey, IDKey>> registry = getRegistry(); if (registry == null) { - registry = new HashSet<Pair<IDKey, IDKey>>(); + registry = new HashSet<>(); REGISTRY.set(registry); } final Pair<IDKey, IDKey> pair = getRegisterPair(lhs, rhs); http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4f82195a/src/main/java/org/apache/commons/lang3/builder/HashCodeBuilder.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/builder/HashCodeBuilder.java b/src/main/java/org/apache/commons/lang3/builder/HashCodeBuilder.java index 6dbc8e6..7df9fb6 100644 --- a/src/main/java/org/apache/commons/lang3/builder/HashCodeBuilder.java +++ b/src/main/java/org/apache/commons/lang3/builder/HashCodeBuilder.java @@ -118,7 +118,7 @@ public class HashCodeBuilder implements Builder<Integer> { * * @since 2.3 */ - private static final ThreadLocal<Set<IDKey>> REGISTRY = new ThreadLocal<Set<IDKey>>(); + private static final ThreadLocal<Set<IDKey>> REGISTRY = new ThreadLocal<>(); /* * NOTE: we cannot store the actual objects in a HashSet, as that would use the very hashCode() @@ -500,7 +500,7 @@ public class HashCodeBuilder implements Builder<Integer> { private static void register(final Object value) { Set<IDKey> registry = getRegistry(); if (registry == null) { - registry = new HashSet<IDKey>(); + registry = new HashSet<>(); REGISTRY.set(registry); } registry.add(new IDKey(value)); http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4f82195a/src/main/java/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java b/src/main/java/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java index 61ce666..d40a838 100644 --- a/src/main/java/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java +++ b/src/main/java/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java @@ -340,7 +340,7 @@ public class ReflectionToStringBuilder extends ToStringBuilder { * @return The given array or a new array without null. */ static String[] toNoNullStringArray(final Object[] array) { - final List<String> list = new ArrayList<String>(array.length); + final List<String> list = new ArrayList<>(array.length); for (final Object e : array) { if (e != null) { list.add(e.toString()); http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4f82195a/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 ec48d2b..8a8e653 100644 --- a/src/main/java/org/apache/commons/lang3/builder/ToStringStyle.java +++ b/src/main/java/org/apache/commons/lang3/builder/ToStringStyle.java @@ -165,7 +165,7 @@ public abstract class ToStringStyle implements Serializable { * </p> */ private static final ThreadLocal<WeakHashMap<Object, Object>> REGISTRY = - new ThreadLocal<WeakHashMap<Object,Object>>(); + new ThreadLocal<>(); /* * Note that objects of this class are generally shared between threads, so * an instance variable would not be suitable here. @@ -217,7 +217,7 @@ public abstract class ToStringStyle implements Serializable { if (value != null) { final Map<Object, Object> m = getRegistry(); if (m == null) { - REGISTRY.set(new WeakHashMap<Object, Object>()); + REGISTRY.set(new WeakHashMap<>()); } getRegistry().put(value, null); } http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4f82195a/src/main/java/org/apache/commons/lang3/concurrent/AbstractCircuitBreaker.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/concurrent/AbstractCircuitBreaker.java b/src/main/java/org/apache/commons/lang3/concurrent/AbstractCircuitBreaker.java index dfe3651..931c565 100644 --- a/src/main/java/org/apache/commons/lang3/concurrent/AbstractCircuitBreaker.java +++ b/src/main/java/org/apache/commons/lang3/concurrent/AbstractCircuitBreaker.java @@ -34,7 +34,7 @@ public abstract class AbstractCircuitBreaker<T> implements CircuitBreaker<T> { public static final String PROPERTY_NAME = "open"; /** The current state of this circuit breaker. */ - protected final AtomicReference<State> state = new AtomicReference<State>(State.CLOSED); + protected final AtomicReference<State> state = new AtomicReference<>(State.CLOSED); /** An object for managing change listeners registered at this instance. */ private final PropertyChangeSupport changeSupport; http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4f82195a/src/main/java/org/apache/commons/lang3/concurrent/AtomicInitializer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/concurrent/AtomicInitializer.java b/src/main/java/org/apache/commons/lang3/concurrent/AtomicInitializer.java index 416dba7..ac4b85e 100644 --- a/src/main/java/org/apache/commons/lang3/concurrent/AtomicInitializer.java +++ b/src/main/java/org/apache/commons/lang3/concurrent/AtomicInitializer.java @@ -65,7 +65,7 @@ import java.util.concurrent.atomic.AtomicReference; */ public abstract class AtomicInitializer<T> implements ConcurrentInitializer<T> { /** Holds the reference to the managed object. */ - private final AtomicReference<T> reference = new AtomicReference<T>(); + private final AtomicReference<T> reference = new AtomicReference<>(); /** * Returns the object managed by this initializer. The object is created if http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4f82195a/src/main/java/org/apache/commons/lang3/concurrent/AtomicSafeInitializer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/concurrent/AtomicSafeInitializer.java b/src/main/java/org/apache/commons/lang3/concurrent/AtomicSafeInitializer.java index 3ad5e4e..0b1a500 100644 --- a/src/main/java/org/apache/commons/lang3/concurrent/AtomicSafeInitializer.java +++ b/src/main/java/org/apache/commons/lang3/concurrent/AtomicSafeInitializer.java @@ -56,10 +56,10 @@ public abstract class AtomicSafeInitializer<T> implements ConcurrentInitializer<T> { /** A guard which ensures that initialize() is called only once. */ private final AtomicReference<AtomicSafeInitializer<T>> factory = - new AtomicReference<AtomicSafeInitializer<T>>(); + new AtomicReference<>(); /** Holds the reference to the managed object. */ - private final AtomicReference<T> reference = new AtomicReference<T>(); + private final AtomicReference<T> reference = new AtomicReference<>(); /** * Get (and initialize, if not initialized yet) the required object http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4f82195a/src/main/java/org/apache/commons/lang3/concurrent/ConcurrentUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/concurrent/ConcurrentUtils.java b/src/main/java/org/apache/commons/lang3/concurrent/ConcurrentUtils.java index 06c4080..d024524 100644 --- a/src/main/java/org/apache/commons/lang3/concurrent/ConcurrentUtils.java +++ b/src/main/java/org/apache/commons/lang3/concurrent/ConcurrentUtils.java @@ -322,7 +322,7 @@ public class ConcurrentUtils { * @return an instance of Future that will return the value, never null */ public static <T> Future<T> constantFuture(final T value) { - return new ConstantFuture<T>(value); + return new ConstantFuture<>(value); } /** http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4f82195a/src/main/java/org/apache/commons/lang3/concurrent/EventCountCircuitBreaker.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/concurrent/EventCountCircuitBreaker.java b/src/main/java/org/apache/commons/lang3/concurrent/EventCountCircuitBreaker.java index c553935..504ac36 100644 --- a/src/main/java/org/apache/commons/lang3/concurrent/EventCountCircuitBreaker.java +++ b/src/main/java/org/apache/commons/lang3/concurrent/EventCountCircuitBreaker.java @@ -175,7 +175,7 @@ public class EventCountCircuitBreaker extends AbstractCircuitBreaker<Integer> { TimeUnit openingUnit, int closingThreshold, long closingInterval, TimeUnit closingUnit) { super(); - checkIntervalData = new AtomicReference<CheckIntervalData>(new CheckIntervalData(0, 0)); + checkIntervalData = new AtomicReference<>(new CheckIntervalData(0, 0)); this.openingThreshold = openingThreshold; this.openingInterval = openingUnit.toNanos(openingInterval); this.closingThreshold = closingThreshold; @@ -416,7 +416,7 @@ public class EventCountCircuitBreaker extends AbstractCircuitBreaker<Integer> { * @return the strategy map */ private static Map<State, StateStrategy> createStrategyMap() { - Map<State, StateStrategy> map = new EnumMap<State, StateStrategy>(State.class); + Map<State, StateStrategy> map = new EnumMap<>(State.class); map.put(State.CLOSED, new StateStrategyClosed()); map.put(State.OPEN, new StateStrategyOpen()); return map; http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4f82195a/src/main/java/org/apache/commons/lang3/concurrent/MultiBackgroundInitializer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/concurrent/MultiBackgroundInitializer.java b/src/main/java/org/apache/commons/lang3/concurrent/MultiBackgroundInitializer.java index 2ca5c6e..c672538 100644 --- a/src/main/java/org/apache/commons/lang3/concurrent/MultiBackgroundInitializer.java +++ b/src/main/java/org/apache/commons/lang3/concurrent/MultiBackgroundInitializer.java @@ -98,7 +98,7 @@ public class MultiBackgroundInitializer BackgroundInitializer<MultiBackgroundInitializer.MultiBackgroundInitializerResults> { /** A map with the child initializers. */ private final Map<String, BackgroundInitializer<?>> childInitializers = - new HashMap<String, BackgroundInitializer<?>>(); + new HashMap<>(); /** * Creates a new instance of {@code MultiBackgroundInitializer}. @@ -185,7 +185,7 @@ public class MultiBackgroundInitializer Map<String, BackgroundInitializer<?>> inits; synchronized (this) { // create a snapshot to operate on - inits = new HashMap<String, BackgroundInitializer<?>>( + inits = new HashMap<>( childInitializers); } @@ -200,8 +200,8 @@ public class MultiBackgroundInitializer } // collect the results - final Map<String, Object> results = new HashMap<String, Object>(); - final Map<String, ConcurrentException> excepts = new HashMap<String, ConcurrentException>(); + final Map<String, Object> results = new HashMap<>(); + final Map<String, ConcurrentException> excepts = new HashMap<>(); for (final Map.Entry<String, BackgroundInitializer<?>> e : inits.entrySet()) { try { results.put(e.getKey(), e.getValue().get()); http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4f82195a/src/main/java/org/apache/commons/lang3/event/EventListenerSupport.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/event/EventListenerSupport.java b/src/main/java/org/apache/commons/lang3/event/EventListenerSupport.java index 8ad04cc..5d3ed6b 100644 --- a/src/main/java/org/apache/commons/lang3/event/EventListenerSupport.java +++ b/src/main/java/org/apache/commons/lang3/event/EventListenerSupport.java @@ -76,7 +76,7 @@ public class EventListenerSupport<L> implements Serializable { * intentionally a thread-safe copy-on-write-array so that traversals over * the list of listeners will be atomic. */ - private List<L> listeners = new CopyOnWriteArrayList<L>(); + private List<L> listeners = new CopyOnWriteArrayList<>(); /** * The proxy representing the collection of listeners. Calls to this proxy @@ -106,7 +106,7 @@ public class EventListenerSupport<L> implements Serializable { * not an interface. */ public static <T> EventListenerSupport<T> create(final Class<T> listenerInterface) { - return new EventListenerSupport<T>(listenerInterface); + return new EventListenerSupport<>(listenerInterface); } /** @@ -240,7 +240,7 @@ public class EventListenerSupport<L> implements Serializable { * @throws IOException if an IO error occurs */ private void writeObject(final ObjectOutputStream objectOutputStream) throws IOException { - final ArrayList<L> serializableListeners = new ArrayList<L>(); + final ArrayList<L> serializableListeners = new ArrayList<>(); // don't just rely on instanceof Serializable: ObjectOutputStream testObjectOutputStream = new ObjectOutputStream(new ByteArrayOutputStream()); @@ -271,7 +271,7 @@ public class EventListenerSupport<L> implements Serializable { final L[] srcListeners = (L[]) objectInputStream.readObject(); - this.listeners = new CopyOnWriteArrayList<L>(srcListeners); + this.listeners = new CopyOnWriteArrayList<>(srcListeners); @SuppressWarnings("unchecked") // Will throw CCE here if not correct final http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4f82195a/src/main/java/org/apache/commons/lang3/event/EventUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/event/EventUtils.java b/src/main/java/org/apache/commons/lang3/event/EventUtils.java index 0bddc93..c5baf62 100644 --- a/src/main/java/org/apache/commons/lang3/event/EventUtils.java +++ b/src/main/java/org/apache/commons/lang3/event/EventUtils.java @@ -93,7 +93,7 @@ public class EventUtils { EventBindingInvocationHandler(final Object target, final String methodName, final String[] eventTypes) { this.target = target; this.methodName = methodName; - this.eventTypes = new HashSet<String>(Arrays.asList(eventTypes)); + this.eventTypes = new HashSet<>(Arrays.asList(eventTypes)); } /** http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4f82195a/src/main/java/org/apache/commons/lang3/exception/DefaultExceptionContext.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/exception/DefaultExceptionContext.java b/src/main/java/org/apache/commons/lang3/exception/DefaultExceptionContext.java index adaf058..17d98a4 100644 --- a/src/main/java/org/apache/commons/lang3/exception/DefaultExceptionContext.java +++ b/src/main/java/org/apache/commons/lang3/exception/DefaultExceptionContext.java @@ -44,14 +44,14 @@ public class DefaultExceptionContext implements ExceptionContext, Serializable { private static final long serialVersionUID = 20110706L; /** The list storing the label-data pairs. */ - private final List<Pair<String, Object>> contextValues = new ArrayList<Pair<String,Object>>(); + private final List<Pair<String, Object>> contextValues = new ArrayList<>(); /** * {@inheritDoc} */ @Override public DefaultExceptionContext addContextValue(final String label, final Object value) { - contextValues.add(new ImmutablePair<String, Object>(label, value)); + contextValues.add(new ImmutablePair<>(label, value)); return this; } @@ -75,7 +75,7 @@ public class DefaultExceptionContext implements ExceptionContext, Serializable { */ @Override public List<Object> getContextValues(final String label) { - final List<Object> values = new ArrayList<Object>(); + final List<Object> values = new ArrayList<>(); for (final Pair<String, Object> pair : contextValues) { if (StringUtils.equals(label, pair.getKey())) { values.add(pair.getValue()); @@ -102,7 +102,7 @@ public class DefaultExceptionContext implements ExceptionContext, Serializable { */ @Override public Set<String> getContextLabels() { - final Set<String> labels = new HashSet<String>(); + final Set<String> labels = new HashSet<>(); for (final Pair<String, Object> pair : contextValues) { labels.add(pair.getKey()); } http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4f82195a/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 4fc6774..f26a07a 100644 --- a/src/main/java/org/apache/commons/lang3/exception/ExceptionUtils.java +++ b/src/main/java/org/apache/commons/lang3/exception/ExceptionUtils.java @@ -283,7 +283,7 @@ public class ExceptionUtils { * @since Commons Lang 2.2 */ public static List<Throwable> getThrowableList(Throwable throwable) { - final List<Throwable> list = new ArrayList<Throwable>(); + final List<Throwable> list = new ArrayList<>(); while (throwable != null && list.contains(throwable) == false) { list.add(throwable); throwable = ExceptionUtils.getCause(throwable); @@ -524,7 +524,7 @@ public class ExceptionUtils { } final Throwable throwables[] = getThrowables(throwable); final int count = throwables.length; - final List<String> frames = new ArrayList<String>(); + final List<String> frames = new ArrayList<>(); List<String> nextTrace = getStackFrameList(throwables[count - 1]); for (int i = count; --i >= 0;) { final List<String> trace = nextTrace; @@ -623,7 +623,7 @@ public class ExceptionUtils { static String[] getStackFrames(final String stackTrace) { final String linebreak = SystemUtils.LINE_SEPARATOR; final StringTokenizer frames = new StringTokenizer(stackTrace, linebreak); - final List<String> list = new ArrayList<String>(); + final List<String> list = new ArrayList<>(); while (frames.hasMoreTokens()) { list.add(frames.nextToken()); } @@ -646,7 +646,7 @@ public class ExceptionUtils { final String stackTrace = getStackTrace(t); final String linebreak = SystemUtils.LINE_SEPARATOR; final StringTokenizer frames = new StringTokenizer(stackTrace, linebreak); - final List<String> list = new ArrayList<String>(); + final List<String> list = new ArrayList<>(); boolean traceStarted = false; while (frames.hasMoreTokens()) { final String token = frames.nextToken(); http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4f82195a/src/main/java/org/apache/commons/lang3/reflect/FieldUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/reflect/FieldUtils.java b/src/main/java/org/apache/commons/lang3/reflect/FieldUtils.java index f8fc113..8b4ac30 100644 --- a/src/main/java/org/apache/commons/lang3/reflect/FieldUtils.java +++ b/src/main/java/org/apache/commons/lang3/reflect/FieldUtils.java @@ -211,7 +211,7 @@ public class FieldUtils { */ public static List<Field> getAllFieldsList(final Class<?> cls) { Validate.isTrue(cls != null, "The class must not be null"); - final List<Field> allFields = new ArrayList<Field>(); + final List<Field> allFields = new ArrayList<>(); Class<?> currentClass = cls; while (currentClass != null) { final Field[] declaredFields = currentClass.getDeclaredFields(); @@ -253,7 +253,7 @@ public class FieldUtils { public static List<Field> getFieldsListWithAnnotation(final Class<?> cls, final Class<? extends Annotation> annotationCls) { Validate.isTrue(annotationCls != null, "The annotation class must not be null"); final List<Field> allFields = getAllFieldsList(cls); - final List<Field> annotatedFields = new ArrayList<Field>(); + final List<Field> annotatedFields = new ArrayList<>(); for (final Field field : allFields) { if (field.getAnnotation(annotationCls) != null) { annotatedFields.add(field); http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4f82195a/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java b/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java index 29fbf37..cc0a0e4 100644 --- a/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java +++ b/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java @@ -781,7 +781,7 @@ public class MethodUtils { */ public static Set<Method> getOverrideHierarchy(final Method method, final Interfaces interfacesBehavior) { Validate.notNull(method); - final Set<Method> result = new LinkedHashSet<Method>(); + final Set<Method> result = new LinkedHashSet<>(); result.add(method); final Class<?>[] parameterTypes = method.getParameterTypes(); @@ -847,7 +847,7 @@ public class MethodUtils { Validate.isTrue(cls != null, "The class must not be null"); Validate.isTrue(annotationCls != null, "The annotation class must not be null"); final Method[] allMethods = cls.getMethods(); - final List<Method> annotatedMethods = new ArrayList<Method>(); + final List<Method> annotatedMethods = new ArrayList<>(); for (final Method method : allMethods) { if (method.getAnnotation(annotationCls) != null) { annotatedMethods.add(method); http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4f82195a/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 30e9940..ad032e8 100644 --- a/src/main/java/org/apache/commons/lang3/reflect/TypeUtils.java +++ b/src/main/java/org/apache/commons/lang3/reflect/TypeUtils.java @@ -865,7 +865,7 @@ public class TypeUtils { } else { // no owner, prep the type variable assignments map typeVarAssigns = subtypeVarAssigns == null ? new HashMap<TypeVariable<?>, Type>() - : new HashMap<TypeVariable<?>, Type>(subtypeVarAssigns); + : new HashMap<>(subtypeVarAssigns); } // get the subject parameterized type's arguments @@ -910,7 +910,7 @@ public class TypeUtils { if (toClass.isPrimitive()) { // dealing with widening here. No type arguments to be // harvested with these two types. - return new HashMap<TypeVariable<?>, Type>(); + return new HashMap<>(); } // work with wrapper the wrapper class instead of the primitive @@ -919,7 +919,7 @@ public class TypeUtils { // create a copy of the incoming map, or an empty one if it's null final HashMap<TypeVariable<?>, Type> typeVarAssigns = subtypeVarAssigns == null ? new HashMap<TypeVariable<?>, Type>() - : new HashMap<TypeVariable<?>, Type>(subtypeVarAssigns); + : new HashMap<>(subtypeVarAssigns); // has target class been reached? if (toClass.equals(cls)) { @@ -1132,7 +1132,7 @@ public class TypeUtils { return bounds; } - final Set<Type> types = new HashSet<Type>(bounds.length); + final Set<Type> types = new HashSet<>(bounds.length); for (final Type type1 : bounds) { boolean subtypeFound = false; @@ -1377,7 +1377,7 @@ public class TypeUtils { if (p.getOwnerType() == null) { parameterizedTypeArguments = typeArguments; } else { - parameterizedTypeArguments = new HashMap<TypeVariable<?>, Type>(typeArguments); + parameterizedTypeArguments = new HashMap<>(typeArguments); parameterizedTypeArguments.putAll(TypeUtils.getTypeArguments(p)); } final Type[] args = p.getActualTypeArguments(); http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4f82195a/src/main/java/org/apache/commons/lang3/text/ExtendedMessageFormat.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/text/ExtendedMessageFormat.java b/src/main/java/org/apache/commons/lang3/text/ExtendedMessageFormat.java index d0835aa..2c6a10e 100644 --- a/src/main/java/org/apache/commons/lang3/text/ExtendedMessageFormat.java +++ b/src/main/java/org/apache/commons/lang3/text/ExtendedMessageFormat.java @@ -145,8 +145,8 @@ public class ExtendedMessageFormat extends MessageFormat { toPattern = super.toPattern(); return; } - final ArrayList<Format> foundFormats = new ArrayList<Format>(); - final ArrayList<String> foundDescriptions = new ArrayList<String>(); + final ArrayList<Format> foundFormats = new ArrayList<>(); + final ArrayList<String> foundDescriptions = new ArrayList<>(); final StringBuilder stripCustom = new StringBuilder(pattern.length()); final ParsePosition pos = new ParsePosition(0); http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4f82195a/src/main/java/org/apache/commons/lang3/text/StrLookup.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/text/StrLookup.java b/src/main/java/org/apache/commons/lang3/text/StrLookup.java index 446ee4c..01e87f2 100644 --- a/src/main/java/org/apache/commons/lang3/text/StrLookup.java +++ b/src/main/java/org/apache/commons/lang3/text/StrLookup.java @@ -38,7 +38,7 @@ public abstract class StrLookup<V> { /** * Lookup that always returns null. */ - private static final StrLookup<String> NONE_LOOKUP = new MapStrLookup<String>(null); + private static final StrLookup<String> NONE_LOOKUP = new MapStrLookup<>(null); /** * Lookup based on system properties. @@ -81,7 +81,7 @@ public abstract class StrLookup<V> { * @return a lookup using the map, not null */ public static <V> StrLookup<V> mapLookup(final Map<String, V> map) { - return new MapStrLookup<V>(map); + return new MapStrLookup<>(map); } //----------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4f82195a/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 126af84..db3a99a 100644 --- a/src/main/java/org/apache/commons/lang3/text/StrSubstitutor.java +++ b/src/main/java/org/apache/commons/lang3/text/StrSubstitutor.java @@ -213,7 +213,7 @@ public class StrSubstitutor { if (valueProperties == null) { return source.toString(); } - final Map<String,String> valueMap = new HashMap<String,String>(); + final Map<String,String> valueMap = new HashMap<>(); final Enumeration<?> propNames = valueProperties.propertyNames(); while (propNames.hasMoreElements()) { final String propName = (String)propNames.nextElement(); @@ -837,7 +837,7 @@ public class StrSubstitutor { // on the first call initialize priorVariables if (priorVariables == null) { - priorVariables = new ArrayList<String>(); + priorVariables = new ArrayList<>(); priorVariables.add(new String(chars, offset, length)); } http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4f82195a/src/main/java/org/apache/commons/lang3/text/StrTokenizer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/text/StrTokenizer.java b/src/main/java/org/apache/commons/lang3/text/StrTokenizer.java index 53782ce..5ce5199 100644 --- a/src/main/java/org/apache/commons/lang3/text/StrTokenizer.java +++ b/src/main/java/org/apache/commons/lang3/text/StrTokenizer.java @@ -440,7 +440,7 @@ public class StrTokenizer implements ListIterator<String>, Cloneable { */ public List<String> getTokenList() { checkTokenized(); - final List<String> list = new ArrayList<String>(tokens.length); + final List<String> list = new ArrayList<>(tokens.length); for (final String element : tokens) { list.add(element); } @@ -636,7 +636,7 @@ public class StrTokenizer implements ListIterator<String>, Cloneable { return Collections.emptyList(); } final StrBuilder buf = new StrBuilder(); - final List<String> tokenList = new ArrayList<String>(); + final List<String> tokenList = new ArrayList<>(); int pos = offset; // loop around the entire buffer http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4f82195a/src/main/java/org/apache/commons/lang3/text/translate/LookupTranslator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/text/translate/LookupTranslator.java b/src/main/java/org/apache/commons/lang3/text/translate/LookupTranslator.java index ea1fbc3..d6cea66 100644 --- a/src/main/java/org/apache/commons/lang3/text/translate/LookupTranslator.java +++ b/src/main/java/org/apache/commons/lang3/text/translate/LookupTranslator.java @@ -43,8 +43,8 @@ public class LookupTranslator extends CharSequenceTranslator { * @param lookup CharSequence[][] table of size [*][2] */ public LookupTranslator(final CharSequence[]... lookup) { - lookupMap = new HashMap<String, String>(); - prefixSet = new HashSet<Character>(); + lookupMap = new HashMap<>(); + prefixSet = new HashSet<>(); int _shortest = Integer.MAX_VALUE; int _longest = 0; if (lookup != null) { http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4f82195a/src/main/java/org/apache/commons/lang3/time/DurationFormatUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/time/DurationFormatUtils.java b/src/main/java/org/apache/commons/lang3/time/DurationFormatUtils.java index b471e36..d139666 100644 --- a/src/main/java/org/apache/commons/lang3/time/DurationFormatUtils.java +++ b/src/main/java/org/apache/commons/lang3/time/DurationFormatUtils.java @@ -494,7 +494,7 @@ public class DurationFormatUtils { * @return array of Token[] */ static Token[] lexx(final String format) { - final ArrayList<Token> list = new ArrayList<Token>(format.length()); + final ArrayList<Token> list = new ArrayList<>(format.length()); boolean inLiteral = false; // Although the buffer is stored in a Token, the Tokens are only http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4f82195a/src/main/java/org/apache/commons/lang3/time/FastDateParser.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/time/FastDateParser.java b/src/main/java/org/apache/commons/lang3/time/FastDateParser.java index f52008d..f6caf10 100644 --- a/src/main/java/org/apache/commons/lang3/time/FastDateParser.java +++ b/src/main/java/org/apache/commons/lang3/time/FastDateParser.java @@ -160,7 +160,7 @@ public class FastDateParser implements DateParser, Serializable { * @param definingCalendar the {@link java.util.Calendar} instance used to initialize this FastDateParser */ private void init(final Calendar definingCalendar) { - patterns = new ArrayList<StrategyAndWidth>(); + patterns = new ArrayList<>(); StrategyParser fm = new StrategyParser(pattern, definingCalendar); for(;;) { @@ -464,10 +464,10 @@ public class FastDateParser implements DateParser, Serializable { * @return The map of string display names to field values */ private static Map<String, Integer> appendDisplayNames(Calendar cal, Locale locale, int field, StringBuilder regex) { - Map<String, Integer> values = new HashMap<String, Integer>(); + Map<String, Integer> values = new HashMap<>(); Map<String, Integer> displayNames = cal.getDisplayNames(field, Calendar.ALL_STYLES, locale); - TreeSet<String> sorted = new TreeSet<String>(LONGER_FIRST_LOWERCASE); + TreeSet<String> sorted = new TreeSet<>(LONGER_FIRST_LOWERCASE); for (Map.Entry<String, Integer> displayName : displayNames.entrySet()) { String key = displayName.getKey().toLowerCase(locale); if (sorted.add(key)) { @@ -618,7 +618,7 @@ public class FastDateParser implements DateParser, Serializable { private static ConcurrentMap<Locale, Strategy> getCache(final int field) { synchronized (caches) { if (caches[field] == null) { - caches[field] = new ConcurrentHashMap<Locale, Strategy>(3); + caches[field] = new ConcurrentHashMap<>(3); } return caches[field]; } @@ -815,7 +815,7 @@ public class FastDateParser implements DateParser, Serializable { private static final String GMT_OPTION= "GMT[+-]\\d{1,2}:\\d{2}"; private final Locale locale; - private final Map<String, TzInfo> tzNames= new HashMap<String, TzInfo>(); + private final Map<String, TzInfo> tzNames= new HashMap<>(); private static class TzInfo { TimeZone zone; @@ -842,7 +842,7 @@ public class FastDateParser implements DateParser, Serializable { final StringBuilder sb = new StringBuilder(); sb.append("((?iu)" + RFC_822_TIME_ZONE + "|" + GMT_OPTION ); - final Set<String> sorted = new TreeSet<String>(LONGER_FIRST_LOWERCASE); + final Set<String> sorted = new TreeSet<>(LONGER_FIRST_LOWERCASE); final String[][] zones = DateFormatSymbols.getInstance(locale).getZoneStrings(); for (final String[] zoneNames : zones) { http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4f82195a/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 ae184f2..8198063 100644 --- a/src/main/java/org/apache/commons/lang3/time/FastDatePrinter.java +++ b/src/main/java/org/apache/commons/lang3/time/FastDatePrinter.java @@ -180,7 +180,7 @@ public class FastDatePrinter implements DatePrinter, Serializable { */ protected List<Rule> parsePattern() { final DateFormatSymbols symbols = new DateFormatSymbols(mLocale); - final List<Rule> rules = new ArrayList<Rule>(); + final List<Rule> rules = new ArrayList<>(); final String[] ERAs = symbols.getEras(); final String[] months = symbols.getMonths(); @@ -1302,7 +1302,7 @@ public class FastDatePrinter implements DatePrinter, Serializable { //----------------------------------------------------------------------- private static final ConcurrentMap<TimeZoneDisplayKey, String> cTimeZoneDisplayCache = - new ConcurrentHashMap<TimeZoneDisplayKey, String>(7); + new ConcurrentHashMap<>(7); /** * <p>Gets the time zone display name, using a cache for performance.</p> * http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4f82195a/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 9224b59..e0e26c4 100644 --- a/src/main/java/org/apache/commons/lang3/time/FormatCache.java +++ b/src/main/java/org/apache/commons/lang3/time/FormatCache.java @@ -38,10 +38,10 @@ abstract class FormatCache<F extends Format> { static final int NONE= -1; private final ConcurrentMap<MultipartKey, F> cInstanceCache - = new ConcurrentHashMap<MultipartKey, F>(7); + = new ConcurrentHashMap<>(7); private static final ConcurrentMap<MultipartKey, String> cDateTimeInstanceCache - = new ConcurrentHashMap<MultipartKey, String>(7); + = new ConcurrentHashMap<>(7); /** * <p>Gets a formatter instance using the default pattern in the http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4f82195a/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 dfb66eb..c2b92be 100644 --- a/src/main/java/org/apache/commons/lang3/tuple/ImmutablePair.java +++ b/src/main/java/org/apache/commons/lang3/tuple/ImmutablePair.java @@ -54,7 +54,7 @@ public final class ImmutablePair<L, R> extends Pair<L, R> { * @return a pair formed from the two parameters, not null */ public static <L, R> ImmutablePair<L, R> of(final L left, final R right) { - return new ImmutablePair<L, R>(left, right); + return new ImmutablePair<>(left, right); } /** http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4f82195a/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 cc64c0d..68ef742 100644 --- a/src/main/java/org/apache/commons/lang3/tuple/ImmutableTriple.java +++ b/src/main/java/org/apache/commons/lang3/tuple/ImmutableTriple.java @@ -59,7 +59,7 @@ public final class ImmutableTriple<L, M, R> extends Triple<L, M, R> { * @return a triple formed from the three parameters, not null */ public static <L, M, R> ImmutableTriple<L, M, R> of(final L left, final M middle, final R right) { - return new ImmutableTriple<L, M, R>(left, middle, right); + return new ImmutableTriple<>(left, middle, right); } /** http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4f82195a/src/main/java/org/apache/commons/lang3/tuple/MutablePair.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/tuple/MutablePair.java b/src/main/java/org/apache/commons/lang3/tuple/MutablePair.java index 35ab576..3c99ac4 100644 --- a/src/main/java/org/apache/commons/lang3/tuple/MutablePair.java +++ b/src/main/java/org/apache/commons/lang3/tuple/MutablePair.java @@ -49,7 +49,7 @@ public class MutablePair<L, R> extends Pair<L, R> { * @return a pair formed from the two parameters, not null */ public static <L, R> MutablePair<L, R> of(final L left, final R right) { - return new MutablePair<L, R>(left, right); + return new MutablePair<>(left, right); } /** http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4f82195a/src/main/java/org/apache/commons/lang3/tuple/MutableTriple.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/tuple/MutableTriple.java b/src/main/java/org/apache/commons/lang3/tuple/MutableTriple.java index 1d32184..bb695dd 100644 --- a/src/main/java/org/apache/commons/lang3/tuple/MutableTriple.java +++ b/src/main/java/org/apache/commons/lang3/tuple/MutableTriple.java @@ -54,7 +54,7 @@ public class MutableTriple<L, M, R> extends Triple<L, M, R> { * @return a triple formed from the three parameters, not null */ public static <L, M, R> MutableTriple<L, M, R> of(final L left, final M middle, final R right) { - return new MutableTriple<L, M, R>(left, middle, right); + return new MutableTriple<>(left, middle, right); } /** http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4f82195a/src/main/java/org/apache/commons/lang3/tuple/Pair.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/tuple/Pair.java b/src/main/java/org/apache/commons/lang3/tuple/Pair.java index 1f5a471..94b421c 100644 --- a/src/main/java/org/apache/commons/lang3/tuple/Pair.java +++ b/src/main/java/org/apache/commons/lang3/tuple/Pair.java @@ -56,7 +56,7 @@ public abstract class Pair<L, R> implements Map.Entry<L, R>, Comparable<Pair<L, * @return a pair formed from the two parameters, not null */ public static <L, R> Pair<L, R> of(final L left, final R right) { - return new ImmutablePair<L, R>(left, right); + return new ImmutablePair<>(left, right); } //----------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4f82195a/src/main/java/org/apache/commons/lang3/tuple/Triple.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/tuple/Triple.java b/src/main/java/org/apache/commons/lang3/tuple/Triple.java index 37d1b15..8e98160 100644 --- a/src/main/java/org/apache/commons/lang3/tuple/Triple.java +++ b/src/main/java/org/apache/commons/lang3/tuple/Triple.java @@ -57,7 +57,7 @@ public abstract class Triple<L, M, R> implements Comparable<Triple<L, M, R>>, Se * @return a triple formed from the three parameters, not null */ public static <L, M, R> Triple<L, M, R> of(final L left, final M middle, final R right) { - return new ImmutableTriple<L, M, R>(left, middle, right); + return new ImmutableTriple<>(left, middle, right); } //----------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4f82195a/src/test/java/org/apache/commons/lang3/ClassUtilsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/lang3/ClassUtilsTest.java b/src/test/java/org/apache/commons/lang3/ClassUtilsTest.java index e8f9eb0..7113f33 100644 --- a/src/test/java/org/apache/commons/lang3/ClassUtilsTest.java +++ b/src/test/java/org/apache/commons/lang3/ClassUtilsTest.java @@ -302,7 +302,7 @@ public class ClassUtilsTest { // ------------------------------------------------------------------------- @Test public void test_convertClassNamesToClasses_List() { - final List<String> list = new ArrayList<String>(); + final List<String> list = new ArrayList<>(); List<Class<?>> result = ClassUtils.convertClassNamesToClasses(list); assertEquals(0, result.size()); @@ -328,7 +328,7 @@ public class ClassUtilsTest { @Test public void test_convertClassesToClassNames_List() { - final List<Class<?>> list = new ArrayList<Class<?>>(); + final List<Class<?>> list = new ArrayList<>(); List<String> result = ClassUtils.convertClassesToClassNames(list); assertEquals(0, result.size()); @@ -1103,7 +1103,7 @@ public class ClassUtilsTest { @Test public void testShowJavaBug() throws Exception { // Tests with Collections$UnmodifiableSet - final Set<?> set = Collections.unmodifiableSet(new HashSet<Object>()); + final Set<?> set = Collections.unmodifiableSet(new HashSet<>()); final Method isEmptyMethod = set.getClass().getMethod("isEmpty", new Class[0]); try { isEmptyMethod.invoke(set, new Object[0]); @@ -1116,7 +1116,7 @@ public class ClassUtilsTest { @Test public void testGetPublicMethod() throws Exception { // Tests with Collections$UnmodifiableSet - final Set<?> set = Collections.unmodifiableSet(new HashSet<Object>()); + final Set<?> set = Collections.unmodifiableSet(new HashSet<>()); final Method isEmptyMethod = ClassUtils.getPublicMethod(set.getClass(), "isEmpty", new Class[0]); assertTrue(Modifier.isPublic(isEmptyMethod.getDeclaringClass().getModifiers())); http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4f82195a/src/test/java/org/apache/commons/lang3/HashSetvBitSetTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/lang3/HashSetvBitSetTest.java b/src/test/java/org/apache/commons/lang3/HashSetvBitSetTest.java index eb35089..994631f 100644 --- a/src/test/java/org/apache/commons/lang3/HashSetvBitSetTest.java +++ b/src/test/java/org/apache/commons/lang3/HashSetvBitSetTest.java @@ -80,7 +80,7 @@ public class HashSetvBitSetTest { @SuppressWarnings("boxing") private static int[] testHashSet(final int count) { - final HashSet<Integer> toRemove = new HashSet<Integer>(); + final HashSet<Integer> toRemove = new HashSet<>(); int found = 0; for (int i = 0; i < count; i++) { toRemove.add(found++); http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4f82195a/src/test/java/org/apache/commons/lang3/LocaleUtilsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/lang3/LocaleUtilsTest.java b/src/test/java/org/apache/commons/lang3/LocaleUtilsTest.java index b807666..196f194 100644 --- a/src/test/java/org/apache/commons/lang3/LocaleUtilsTest.java +++ b/src/test/java/org/apache/commons/lang3/LocaleUtilsTest.java @@ -349,7 +349,7 @@ public class LocaleUtilsTest { final Locale[] jdkLocaleArray = Locale.getAvailableLocales(); final List<Locale> jdkLocaleList = Arrays.asList(jdkLocaleArray); - final Set<Locale> jdkLocaleSet = new HashSet<Locale>(jdkLocaleList); + final Set<Locale> jdkLocaleSet = new HashSet<>(jdkLocaleList); assertEquals(jdkLocaleSet, set); } http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4f82195a/src/test/java/org/apache/commons/lang3/ObjectUtilsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/lang3/ObjectUtilsTest.java b/src/test/java/org/apache/commons/lang3/ObjectUtilsTest.java index 0832647..ad93e29 100644 --- a/src/test/java/org/apache/commons/lang3/ObjectUtilsTest.java +++ b/src/test/java/org/apache/commons/lang3/ObjectUtilsTest.java @@ -160,7 +160,7 @@ public class ObjectUtilsTest { @Test public void testHashCodeMulti_multiple_likeList() { - final List<Object> list0 = new ArrayList<Object>(Arrays.asList(new Object[0])); + final List<Object> list0 = new ArrayList<>(Arrays.asList(new Object[0])); assertEquals(list0.hashCode(), ObjectUtils.hashCodeMulti()); final List<Object> list1 = new ArrayList<Object>(Arrays.asList("a")); http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4f82195a/src/test/java/org/apache/commons/lang3/SerializationUtilsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/lang3/SerializationUtilsTest.java b/src/test/java/org/apache/commons/lang3/SerializationUtilsTest.java index e4159ac..caa648b 100644 --- a/src/test/java/org/apache/commons/lang3/SerializationUtilsTest.java +++ b/src/test/java/org/apache/commons/lang3/SerializationUtilsTest.java @@ -56,7 +56,7 @@ public class SerializationUtilsTest { public void setUp() { iString = "foo"; iInteger = Integer.valueOf(7); - iMap = new HashMap<Object, Object>(); + iMap = new HashMap<>(); iMap.put("FOO", iString); iMap.put("BAR", iInteger); } http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4f82195a/src/test/java/org/apache/commons/lang3/ValidateTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/lang3/ValidateTest.java b/src/test/java/org/apache/commons/lang3/ValidateTest.java index cd84ec3..33b4fff 100644 --- a/src/test/java/org/apache/commons/lang3/ValidateTest.java +++ b/src/test/java/org/apache/commons/lang3/ValidateTest.java @@ -186,7 +186,7 @@ public class ValidateTest { //----------------------------------------------------------------------- @Test public void testNotEmptyCollection1() { - final Collection<Integer> coll = new ArrayList<Integer>(); + final Collection<Integer> coll = new ArrayList<>(); try { Validate.notEmpty((Collection<?>) null); fail("Expecting NullPointerException"); @@ -209,7 +209,7 @@ public class ValidateTest { //----------------------------------------------------------------------- @Test public void testNotEmptyCollection2() { - final Collection<Integer> coll = new ArrayList<Integer>(); + final Collection<Integer> coll = new ArrayList<>(); try { Validate.notEmpty((Collection<?>) null, "MSG"); fail("Expecting NullPointerException"); @@ -233,7 +233,7 @@ public class ValidateTest { //----------------------------------------------------------------------- @Test public void testNotEmptyMap1() { - final Map<String, Integer> map = new HashMap<String, Integer>(); + final Map<String, Integer> map = new HashMap<>(); try { Validate.notEmpty((Map<?, ?>) null); fail("Expecting NullPointerException"); @@ -256,7 +256,7 @@ public class ValidateTest { //----------------------------------------------------------------------- @Test public void testNotEmptyMap2() { - final Map<String, Integer> map = new HashMap<String, Integer>(); + final Map<String, Integer> map = new HashMap<>(); try { Validate.notEmpty((Map<?, ?>) null, "MSG"); fail("Expecting NullPointerException"); @@ -590,7 +590,7 @@ public class ValidateTest { //----------------------------------------------------------------------- @Test public void testNoNullElementsCollection1() { - final List<String> coll = new ArrayList<String>(); + final List<String> coll = new ArrayList<>(); coll.add("a"); coll.add("b"); Validate.noNullElements(coll); @@ -616,7 +616,7 @@ public class ValidateTest { //----------------------------------------------------------------------- @Test public void testNoNullElementsCollection2() { - final List<String> coll = new ArrayList<String>(); + final List<String> coll = new ArrayList<>(); coll.add("a"); coll.add("b"); Validate.noNullElements(coll, "MSG"); @@ -703,7 +703,7 @@ public class ValidateTest { //----------------------------------------------------------------------- @Test public void testValidIndex_withMessage_collection() { - final Collection<String> coll = new ArrayList<String>(); + final Collection<String> coll = new ArrayList<>(); coll.add(null); coll.add(null); Validate.validIndex(coll, 0, "Broken: "); @@ -728,7 +728,7 @@ public class ValidateTest { @Test public void testValidIndex_collection() { - final Collection<String> coll = new ArrayList<String>(); + final Collection<String> coll = new ArrayList<>(); coll.add(null); coll.add(null); Validate.validIndex(coll, 0); http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4f82195a/src/test/java/org/apache/commons/lang3/builder/DefaultToStringStyleTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/lang3/builder/DefaultToStringStyleTest.java b/src/test/java/org/apache/commons/lang3/builder/DefaultToStringStyleTest.java index 636d275..b8fd1f1 100644 --- a/src/test/java/org/apache/commons/lang3/builder/DefaultToStringStyleTest.java +++ b/src/test/java/org/apache/commons/lang3/builder/DefaultToStringStyleTest.java @@ -71,10 +71,10 @@ public class DefaultToStringStyleTest { assertEquals(baseStr + "[a=3]", new ToStringBuilder(base).append("a", i3).toString()); assertEquals(baseStr + "[a=3,b=4]", new ToStringBuilder(base).append("a", i3).append("b", i4).toString()); assertEquals(baseStr + "[a=<Integer>]", new ToStringBuilder(base).append("a", i3, false).toString()); - assertEquals(baseStr + "[a=<size=0>]", new ToStringBuilder(base).append("a", new ArrayList<Object>(), false).toString()); - assertEquals(baseStr + "[a=[]]", new ToStringBuilder(base).append("a", new ArrayList<Object>(), true).toString()); - assertEquals(baseStr + "[a=<size=0>]", new ToStringBuilder(base).append("a", new HashMap<Object, Object>(), false).toString()); - assertEquals(baseStr + "[a={}]", new ToStringBuilder(base).append("a", new HashMap<Object, Object>(), true).toString()); + assertEquals(baseStr + "[a=<size=0>]", new ToStringBuilder(base).append("a", new ArrayList<>(), false).toString()); + assertEquals(baseStr + "[a=[]]", new ToStringBuilder(base).append("a", new ArrayList<>(), true).toString()); + assertEquals(baseStr + "[a=<size=0>]", new ToStringBuilder(base).append("a", new HashMap<>(), false).toString()); + assertEquals(baseStr + "[a={}]", new ToStringBuilder(base).append("a", new HashMap<>(), true).toString()); assertEquals(baseStr + "[a=<size=0>]", new ToStringBuilder(base).append("a", (Object) new String[0], false).toString()); assertEquals(baseStr + "[a={}]", new ToStringBuilder(base).append("a", (Object) new String[0], true).toString()); } http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4f82195a/src/test/java/org/apache/commons/lang3/builder/JsonToStringStyleTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/lang3/builder/JsonToStringStyleTest.java b/src/test/java/org/apache/commons/lang3/builder/JsonToStringStyleTest.java index 88d3230..404c9c5 100644 --- a/src/test/java/org/apache/commons/lang3/builder/JsonToStringStyleTest.java +++ b/src/test/java/org/apache/commons/lang3/builder/JsonToStringStyleTest.java @@ -154,18 +154,18 @@ public class JsonToStringStyleTest { } try { - new ToStringBuilder(base).append("a", new ArrayList<Object>(), false).toString(); + new ToStringBuilder(base).append("a", new ArrayList<>(), false).toString(); fail("Should have generated UnsupportedOperationException"); } catch (UnsupportedOperationException e) { } assertEquals( "{\"a\":[]}", - new ToStringBuilder(base).append("a", new ArrayList<Object>(), + new ToStringBuilder(base).append("a", new ArrayList<>(), true).toString()); try { - new ToStringBuilder(base).append("a", new HashMap<Object, Object>(), false).toString(); + new ToStringBuilder(base).append("a", new HashMap<>(), false).toString(); fail("Should have generated UnsupportedOperationException"); } catch (UnsupportedOperationException e) { } @@ -173,7 +173,7 @@ public class JsonToStringStyleTest { assertEquals( "{\"a\":{}}", new ToStringBuilder(base).append("a", - new HashMap<Object, Object>(), true).toString()); + new HashMap<>(), true).toString()); try { new ToStringBuilder(base).append("a", (Object) new String[0], false).toString();
