diff --git a/src/main/java/org/apache/commons/collections4/CollectionUtils.java b/src/main/java/org/apache/commons/collections4/CollectionUtils.java
index f7d3e8211..bd9ddf09a 100644
--- a/src/main/java/org/apache/commons/collections4/CollectionUtils.java
+++ b/src/main/java/org/apache/commons/collections4/CollectionUtils.java
@@ -1189,7 +1189,7 @@ public class CollectionUtils {
      */
     public static <I, O> Collection<O> collect(final Iterator<I> inputIterator,
                                                final Transformer<? super I, ? extends O> transformer) {
-        return collect(inputIterator, transformer, new ArrayList<O>());
+        return collect(inputIterator, transformer, new ArrayList<>());
     }
 
     /**
@@ -1892,7 +1892,7 @@ public class CollectionUtils {
         final Transformer<E, EquatorWrapper<E>> transformer = input -> new EquatorWrapper<>(equator, input);
 
         final Set<EquatorWrapper<E>> retainSet =
-                collect(retain, transformer, new HashSet<EquatorWrapper<E>>());
+                collect(retain, transformer, new HashSet<>());
 
         final List<E> list = new ArrayList<>();
         for (final E element : collection) {
@@ -2031,7 +2031,7 @@ public class CollectionUtils {
         final Transformer<E, EquatorWrapper<E>> transformer = input -> new EquatorWrapper<>(equator, input);
 
         final Set<EquatorWrapper<E>> removeSet =
-                collect(remove, transformer, new HashSet<EquatorWrapper<E>>());
+                collect(remove, transformer, new HashSet<>());
 
         final List<E> list = new ArrayList<>();
         for (final E element : collection) {
diff --git a/src/main/java/org/apache/commons/collections4/ListUtils.java b/src/main/java/org/apache/commons/collections4/ListUtils.java
index dfca88238..53dea6889 100644
--- a/src/main/java/org/apache/commons/collections4/ListUtils.java
+++ b/src/main/java/org/apache/commons/collections4/ListUtils.java
@@ -596,7 +596,7 @@ public class ListUtils {
      */
     public static <E> List<E> select(final Collection<? extends E> inputCollection,
             final Predicate<? super E> predicate) {
-        return CollectionUtils.select(inputCollection, predicate, new ArrayList<E>(inputCollection.size()));
+        return CollectionUtils.select(inputCollection, predicate, new ArrayList<>(inputCollection.size()));
     }
 
     /**
@@ -616,7 +616,7 @@ public class ListUtils {
      */
     public static <E> List<E> selectRejected(final Collection<? extends E> inputCollection,
             final Predicate<? super E> predicate) {
-        return CollectionUtils.selectRejected(inputCollection, predicate, new ArrayList<E>(inputCollection.size()));
+        return CollectionUtils.selectRejected(inputCollection, predicate, new ArrayList<>(inputCollection.size()));
     }
 
     /**
diff --git a/src/main/java/org/apache/commons/collections4/MapUtils.java b/src/main/java/org/apache/commons/collections4/MapUtils.java
index a84b78320..15ea58b9c 100644
--- a/src/main/java/org/apache/commons/collections4/MapUtils.java
+++ b/src/main/java/org/apache/commons/collections4/MapUtils.java
@@ -167,7 +167,7 @@ public class MapUtils {
      * @throws NullPointerException if the stream is {@code null}
      */
     public static void debugPrint(final PrintStream out, final Object label, final Map<?, ?> map) {
-        verbosePrintInternal(out, label, map, new ArrayDeque<Map<?, ?>>(), true);
+        verbosePrintInternal(out, label, map, new ArrayDeque<>(), true);
     }
 
     /**
@@ -1967,7 +1967,7 @@ public class MapUtils {
      * @throws NullPointerException if the stream is {@code null}
      */
     public static void verbosePrint(final PrintStream out, final Object label, final Map<?, ?> map) {
-        verbosePrintInternal(out, label, map, new ArrayDeque<Map<?, ?>>(), false);
+        verbosePrintInternal(out, label, map, new ArrayDeque<>(), false);
     }
 
     /**
diff --git a/src/main/java/org/apache/commons/collections4/SetUtils.java b/src/main/java/org/apache/commons/collections4/SetUtils.java
index 046b0673b..3c3beea4f 100644
--- a/src/main/java/org/apache/commons/collections4/SetUtils.java
+++ b/src/main/java/org/apache/commons/collections4/SetUtils.java
@@ -351,7 +351,7 @@ public class SetUtils {
      * @since 4.1
      */
     public static <E> Set<E> newIdentityHashSet() {
-        return Collections.newSetFromMap(new IdentityHashMap<E, Boolean>());
+        return Collections.newSetFromMap(new IdentityHashMap<>());
     }
 
     /**
diff --git a/src/main/java/org/apache/commons/collections4/bag/HashBag.java b/src/main/java/org/apache/commons/collections4/bag/HashBag.java
index ca9e45849..18d91546a 100644
--- a/src/main/java/org/apache/commons/collections4/bag/HashBag.java
+++ b/src/main/java/org/apache/commons/collections4/bag/HashBag.java
@@ -46,7 +46,7 @@ public class HashBag<E> extends AbstractMapBag<E> implements Serializable {
      * Constructs an empty {@link HashBag}.
      */
     public HashBag() {
-        super(new HashMap<E, MutableInteger>());
+        super(new HashMap<>());
     }
 
     /**
@@ -79,7 +79,7 @@ public class HashBag<E> extends AbstractMapBag<E> implements Serializable {
      */
     private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
         in.defaultReadObject();
-        super.doReadObject(new HashMap<E, MutableInteger>(), in);
+        super.doReadObject(new HashMap<>(), in);
     }
 
 }
diff --git a/src/main/java/org/apache/commons/collections4/bag/TreeBag.java b/src/main/java/org/apache/commons/collections4/bag/TreeBag.java
index 5bb8b9647..a0256f22e 100644
--- a/src/main/java/org/apache/commons/collections4/bag/TreeBag.java
+++ b/src/main/java/org/apache/commons/collections4/bag/TreeBag.java
@@ -53,7 +53,7 @@ public class TreeBag<E> extends AbstractMapBag<E> implements SortedBag<E>, Seria
      * Constructs an empty {@link TreeBag}.
      */
     public TreeBag() {
-        super(new TreeMap<E, MutableInteger>());
+        super(new TreeMap<>());
     }
 
     /**
@@ -63,7 +63,7 @@ public class TreeBag<E> extends AbstractMapBag<E> implements SortedBag<E>, Seria
      * @param comparator the comparator to use
      */
     public TreeBag(final Comparator<? super E> comparator) {
-        super(new TreeMap<E, MutableInteger>(comparator));
+        super(new TreeMap<>(comparator));
     }
 
     /**
@@ -139,7 +139,7 @@ public class TreeBag<E> extends AbstractMapBag<E> implements SortedBag<E>, Seria
         in.defaultReadObject();
         @SuppressWarnings("unchecked")  // This will fail at runtime if the stream is incorrect
         final Comparator<? super E> comp = (Comparator<? super E>) in.readObject();
-        super.doReadObject(new TreeMap<E, MutableInteger>(comp), in);
+        super.doReadObject(new TreeMap<>(comp), in);
     }
 
 }
diff --git a/src/main/java/org/apache/commons/collections4/bidimap/DualHashBidiMap.java b/src/main/java/org/apache/commons/collections4/bidimap/DualHashBidiMap.java
index 9e96ed444..8fd0212f5 100644
--- a/src/main/java/org/apache/commons/collections4/bidimap/DualHashBidiMap.java
+++ b/src/main/java/org/apache/commons/collections4/bidimap/DualHashBidiMap.java
@@ -52,7 +52,7 @@ public class DualHashBidiMap<K, V> extends AbstractDualBidiMap<K, V> implements
      * Creates an empty {@code HashBidiMap}.
      */
     public DualHashBidiMap() {
-        super(new HashMap<K, V>(), new HashMap<V, K>());
+        super(new HashMap<>(), new HashMap<>());
     }
 
     /**
@@ -62,7 +62,7 @@ public class DualHashBidiMap<K, V> extends AbstractDualBidiMap<K, V> implements
      * @param map  the map whose mappings are to be placed in this map
      */
     public DualHashBidiMap(final Map<? extends K, ? extends V> map) {
-        super(new HashMap<K, V>(), new HashMap<V, K>());
+        super(new HashMap<>(), new HashMap<>());
         putAll(map);
     }
 
diff --git a/src/main/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMap.java b/src/main/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMap.java
index 8e9878622..a3ac683fb 100644
--- a/src/main/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMap.java
+++ b/src/main/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMap.java
@@ -46,7 +46,7 @@ public class DualLinkedHashBidiMap<K, V> extends AbstractDualBidiMap<K, V> imple
      * Creates an empty {@code HashBidiMap}.
      */
     public DualLinkedHashBidiMap() {
-        super(new LinkedHashMap<K, V>(), new LinkedHashMap<V, K>());
+        super(new LinkedHashMap<>(), new LinkedHashMap<>());
     }
 
     /**
@@ -56,7 +56,7 @@ public class DualLinkedHashBidiMap<K, V> extends AbstractDualBidiMap<K, V> imple
      * @param map the map whose mappings are to be placed in this map
      */
     public DualLinkedHashBidiMap(final Map<? extends K, ? extends V> map) {
-        super(new LinkedHashMap<K, V>(), new LinkedHashMap<V, K>());
+        super(new LinkedHashMap<>(), new LinkedHashMap<>());
         putAll(map);
     }
 
diff --git a/src/main/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java b/src/main/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java
index 2458b764c..7c3639d06 100644
--- a/src/main/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java
+++ b/src/main/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java
@@ -72,7 +72,7 @@ public class DualTreeBidiMap<K, V> extends AbstractDualBidiMap<K, V>
      * Creates an empty {@link DualTreeBidiMap}.
      */
     public DualTreeBidiMap() {
-        super(new TreeMap<K, V>(), new TreeMap<V, K>());
+        super(new TreeMap<>(), new TreeMap<>());
         this.comparator = null;
         this.valueComparator = null;
     }
@@ -84,7 +84,7 @@ public class DualTreeBidiMap<K, V> extends AbstractDualBidiMap<K, V>
      * @param map  the map whose mappings are to be placed in this map
      */
     public DualTreeBidiMap(final Map<? extends K, ? extends V> map) {
-        super(new TreeMap<K, V>(), new TreeMap<V, K>());
+        super(new TreeMap<>(), new TreeMap<>());
         putAll(map);
         this.comparator = null;
         this.valueComparator = null;
@@ -97,7 +97,7 @@ public class DualTreeBidiMap<K, V> extends AbstractDualBidiMap<K, V>
      * @param valueComparator  the values comparator to use
      */
     public DualTreeBidiMap(final Comparator<? super K> keyComparator, final Comparator<? super V> valueComparator) {
-        super(new TreeMap<K, V>(keyComparator), new TreeMap<V, K>(valueComparator));
+        super(new TreeMap<>(keyComparator), new TreeMap<>(valueComparator));
         this.comparator = keyComparator;
         this.valueComparator = valueComparator;
     }
diff --git a/src/main/java/org/apache/commons/collections4/collection/IndexedCollection.java b/src/main/java/org/apache/commons/collections4/collection/IndexedCollection.java
index 58942e8d3..e88012663 100644
--- a/src/main/java/org/apache/commons/collections4/collection/IndexedCollection.java
+++ b/src/main/java/org/apache/commons/collections4/collection/IndexedCollection.java
@@ -76,7 +76,7 @@ public class IndexedCollection<K, C> extends AbstractCollectionDecorator<C> {
     public static <K, C> IndexedCollection<K, C> uniqueIndexedCollection(final Collection<C> coll,
                                                                          final Transformer<C, K> keyTransformer) {
         return new IndexedCollection<>(coll, keyTransformer,
-                                           MultiValueMap.<K, C>multiValueMap(new HashMap<K, Collection<C>>()),
+                                           MultiValueMap.<K, C>multiValueMap(new HashMap<>()),
                                            true);
     }
 
@@ -92,7 +92,7 @@ public class IndexedCollection<K, C> extends AbstractCollectionDecorator<C> {
     public static <K, C> IndexedCollection<K, C> nonUniqueIndexedCollection(final Collection<C> coll,
                                                                             final Transformer<C, K> keyTransformer) {
         return new IndexedCollection<>(coll, keyTransformer,
-                                           MultiValueMap.<K, C>multiValueMap(new HashMap<K, Collection<C>>()),
+                                           MultiValueMap.<K, C>multiValueMap(new HashMap<>()),
                                            false);
     }
 
diff --git a/src/main/java/org/apache/commons/collections4/collection/PredicatedCollection.java b/src/main/java/org/apache/commons/collections4/collection/PredicatedCollection.java
index 560efee66..d72473cc3 100644
--- a/src/main/java/org/apache/commons/collections4/collection/PredicatedCollection.java
+++ b/src/main/java/org/apache/commons/collections4/collection/PredicatedCollection.java
@@ -268,7 +268,7 @@ public class PredicatedCollection<E> extends AbstractCollectionDecorator<E> {
          * @return a new predicated list.
          */
         public List<E> createPredicatedList() {
-            return createPredicatedList(new ArrayList<E>());
+            return createPredicatedList(new ArrayList<>());
         }
 
         /**
@@ -299,7 +299,7 @@ public class PredicatedCollection<E> extends AbstractCollectionDecorator<E> {
          * @return a new predicated set.
          */
         public Set<E> createPredicatedSet() {
-            return createPredicatedSet(new HashSet<E>());
+            return createPredicatedSet(new HashSet<>());
         }
 
         /**
@@ -330,7 +330,7 @@ public class PredicatedCollection<E> extends AbstractCollectionDecorator<E> {
          * @return a new predicated multiset.
          */
         public MultiSet<E> createPredicatedMultiSet() {
-            return createPredicatedMultiSet(new HashMultiSet<E>());
+            return createPredicatedMultiSet(new HashMultiSet<>());
         }
 
         /**
@@ -362,7 +362,7 @@ public class PredicatedCollection<E> extends AbstractCollectionDecorator<E> {
          * @return a new predicated bag.
          */
         public Bag<E> createPredicatedBag() {
-            return createPredicatedBag(new HashBag<E>());
+            return createPredicatedBag(new HashBag<>());
         }
 
         /**
@@ -393,7 +393,7 @@ public class PredicatedCollection<E> extends AbstractCollectionDecorator<E> {
          * @return a new predicated queue.
          */
         public Queue<E> createPredicatedQueue() {
-            return createPredicatedQueue(new LinkedList<E>());
+            return createPredicatedQueue(new LinkedList<>());
         }
 
         /**
diff --git a/src/main/java/org/apache/commons/collections4/comparators/ComparatorChain.java b/src/main/java/org/apache/commons/collections4/comparators/ComparatorChain.java
index 766da8a0a..ee1fdb5ce 100644
--- a/src/main/java/org/apache/commons/collections4/comparators/ComparatorChain.java
+++ b/src/main/java/org/apache/commons/collections4/comparators/ComparatorChain.java
@@ -69,7 +69,7 @@ public class ComparatorChain<E> implements Comparator<E>, Serializable {
      * UnsupportedOperationException is thrown
      */
     public ComparatorChain() {
-        this(new ArrayList<Comparator<E>>(), new BitSet());
+        this(new ArrayList<>(), new BitSet());
     }
 
     /**
diff --git a/src/main/java/org/apache/commons/collections4/list/GrowthList.java b/src/main/java/org/apache/commons/collections4/list/GrowthList.java
index 3d8044827..b42d16e78 100644
--- a/src/main/java/org/apache/commons/collections4/list/GrowthList.java
+++ b/src/main/java/org/apache/commons/collections4/list/GrowthList.java
@@ -79,7 +79,7 @@ public class GrowthList<E> extends AbstractSerializableListDecorator<E> {
      * Constructor that uses an ArrayList internally.
      */
     public GrowthList() {
-        super(new ArrayList<E>());
+        super(new ArrayList<>());
     }
 
     /**
@@ -89,7 +89,7 @@ public class GrowthList<E> extends AbstractSerializableListDecorator<E> {
      * @throws IllegalArgumentException if initial capacity is invalid
      */
     public GrowthList(final int initialCapacity) {
-        super(new ArrayList<E>(initialCapacity));
+        super(new ArrayList<>(initialCapacity));
     }
 
     /**
diff --git a/src/main/java/org/apache/commons/collections4/list/SetUniqueList.java b/src/main/java/org/apache/commons/collections4/list/SetUniqueList.java
index c3ba144c9..481ec11aa 100644
--- a/src/main/java/org/apache/commons/collections4/list/SetUniqueList.java
+++ b/src/main/java/org/apache/commons/collections4/list/SetUniqueList.java
@@ -76,11 +76,11 @@ public class SetUniqueList<E> extends AbstractSerializableListDecorator<E> {
     public static <E> SetUniqueList<E> setUniqueList(final List<E> list) {
         Objects.requireNonNull(list, "list");
         if (list.isEmpty()) {
-            return new SetUniqueList<>(list, new HashSet<E>());
+            return new SetUniqueList<>(list, new HashSet<>());
         }
         final List<E> temp = new ArrayList<>(list);
         list.clear();
-        final SetUniqueList<E> sl = new SetUniqueList<>(list, new HashSet<E>());
+        final SetUniqueList<E> sl = new SetUniqueList<>(list, new HashSet<>());
         sl.addAll(temp);
         return sl;
     }
diff --git a/src/main/java/org/apache/commons/collections4/map/DefaultedMap.java b/src/main/java/org/apache/commons/collections4/map/DefaultedMap.java
index 90e1bb0a4..46d663aa8 100644
--- a/src/main/java/org/apache/commons/collections4/map/DefaultedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/DefaultedMap.java
@@ -152,7 +152,7 @@ public class DefaultedMap<K, V> extends AbstractMapDecorator<K, V> implements Se
      * @param defaultValueTransformer transformer to use to generate missing values.
      */
     public DefaultedMap(final Transformer<? super K, ? extends V> defaultValueTransformer) {
-        this(new HashMap<K, V>(), defaultValueTransformer);
+        this(new HashMap<>(), defaultValueTransformer);
     }
 
     /**
diff --git a/src/main/java/org/apache/commons/collections4/map/ListOrderedMap.java b/src/main/java/org/apache/commons/collections4/map/ListOrderedMap.java
index 0257714ca..da4df45c7 100644
--- a/src/main/java/org/apache/commons/collections4/map/ListOrderedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/ListOrderedMap.java
@@ -114,7 +114,7 @@ public class ListOrderedMap<K, V>
      * @since 3.1
      */
     public ListOrderedMap() {
-        this(new HashMap<K, V>());
+        this(new HashMap<>());
     }
 
     /**
diff --git a/src/main/java/org/apache/commons/collections4/map/MultiKeyMap.java b/src/main/java/org/apache/commons/collections4/map/MultiKeyMap.java
index d6dd0128d..0250f3f36 100644
--- a/src/main/java/org/apache/commons/collections4/map/MultiKeyMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/MultiKeyMap.java
@@ -114,7 +114,7 @@ public class MultiKeyMap<K, V> extends AbstractMapDecorator<MultiKey<? extends K
      * Constructs a new MultiKeyMap that decorates a {@code HashedMap}.
      */
     public MultiKeyMap() {
-        this(new HashedMap<MultiKey<? extends K>, V>());
+        this(new HashedMap<>());
     }
 
     /**
diff --git a/src/main/java/org/apache/commons/collections4/map/PassiveExpiringMap.java b/src/main/java/org/apache/commons/collections4/map/PassiveExpiringMap.java
index 0979fa8b5..4b3e65720 100644
--- a/src/main/java/org/apache/commons/collections4/map/PassiveExpiringMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/PassiveExpiringMap.java
@@ -218,7 +218,7 @@ public class PassiveExpiringMap<K, V>
      * @throws NullPointerException if expiringPolicy is null
      */
     public PassiveExpiringMap(final ExpirationPolicy<K, V> expiringPolicy) {
-        this(expiringPolicy, new HashMap<K, V>());
+        this(expiringPolicy, new HashMap<>());
     }
 
     /**
@@ -249,8 +249,8 @@ public class PassiveExpiringMap<K, V>
      *        ALWAYS expire.
      */
     public PassiveExpiringMap(final long timeToLiveMillis) {
-        this(new ConstantTimeToLiveExpirationPolicy<K, V>(timeToLiveMillis),
-             new HashMap<K, V>());
+        this(new ConstantTimeToLiveExpirationPolicy<>(timeToLiveMillis),
+                new HashMap<>());
     }
 
     /**
@@ -268,7 +268,7 @@ public class PassiveExpiringMap<K, V>
      * @throws NullPointerException if the map is null.
      */
     public PassiveExpiringMap(final long timeToLiveMillis, final Map<K, V> map) {
-        this(new ConstantTimeToLiveExpirationPolicy<K, V>(timeToLiveMillis),
+        this(new ConstantTimeToLiveExpirationPolicy<>(timeToLiveMillis),
              map);
     }
 
diff --git a/src/main/java/org/apache/commons/collections4/multiset/HashMultiSet.java b/src/main/java/org/apache/commons/collections4/multiset/HashMultiSet.java
index caa51f7ce..715c469a0 100644
--- a/src/main/java/org/apache/commons/collections4/multiset/HashMultiSet.java
+++ b/src/main/java/org/apache/commons/collections4/multiset/HashMultiSet.java
@@ -44,7 +44,7 @@ public class HashMultiSet<E> extends AbstractMapMultiSet<E> implements Serializa
      * Constructs an empty {@link HashMultiSet}.
      */
     public HashMultiSet() {
-        super(new HashMap<E, MutableInteger>());
+        super(new HashMap<>());
     }
 
     /**
@@ -77,7 +77,7 @@ public class HashMultiSet<E> extends AbstractMapMultiSet<E> implements Serializa
      */
     private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
         in.defaultReadObject();
-        setMap(new HashMap<E, MutableInteger>());
+        setMap(new HashMap<>());
         super.doReadObject(in);
     }
 
diff --git a/src/main/java/org/apache/commons/collections4/set/ListOrderedSet.java b/src/main/java/org/apache/commons/collections4/set/ListOrderedSet.java
index 6bbb6a1c8..8d539d5ef 100644
--- a/src/main/java/org/apache/commons/collections4/set/ListOrderedSet.java
+++ b/src/main/java/org/apache/commons/collections4/set/ListOrderedSet.java
@@ -133,7 +133,7 @@ public class ListOrderedSet<E>
      * @since 3.1
      */
     public ListOrderedSet() {
-        super(new HashSet<E>());
+        super(new HashSet<>());
         setOrder = new ArrayList<>();
     }