diff -Nru libcommons-collections4-java-4.1/build.properties.sample libcommons-collections4-java-4.2/build.properties.sample
--- libcommons-collections4-java-4.1/build.properties.sample	2013-11-13 21:15:50.000000000 +0000
+++ libcommons-collections4-java-4.2/build.properties.sample	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements.  See the NOTICE file distributed with
-#   this work for additional information regarding copyright ownership.
-#   The ASF licenses this file to You under the Apache License, Version 2.0
-#   (the "License"); you may not use this file except in compliance with
-#   the License.  You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-##########################################################################
-# Sample Ant build.properties file
-#
-# This setup assumes dependent jars are in a local maven 2 repository.
-# However the jars are located, the properties ending in ".jar" need
-# expand to full paths to the jars.
-##########################################################################
-
-# Repository base path - unnecessary if full jar paths are provided below
-repository=${user.home}/.m2/repository
-junit.home=${repository}/junit/junit/4.11/
-hamcrest.home=${repository}/org/hamcrest/hamcrest-core/1.3/
-easymock.home=${repository}/org/easymock/easymock/3.2/
diff -Nru libcommons-collections4-java-4.1/build.xml libcommons-collections4-java-4.2/build.xml
--- libcommons-collections4-java-4.1/build.xml	2013-06-23 18:27:46.000000000 +0000
+++ libcommons-collections4-java-4.2/build.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,257 +0,0 @@
-<!--
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
- -->
-<!--
-   "Collections" component of the Apache Commons Subproject
-   $Id: build.xml 1495867 2013-06-23 18:27:46Z tn $
--->
-<project name="Collections" default="compile" basedir=".">
-
-    <!-- ========== Initialize Properties ===================================== -->
-    <property file="${user.home}/${component.name}.build.properties"/>
-    <property file="${user.home}/build.properties"/>
-    <property file="${basedir}/build.properties"/>
-    <property file="${basedir}/default.properties"/>
-    <property name="jdk.javadoc" value="http://download.oracle.com/javase/1.5.0/docs/api/"/>
-
-    <!-- ========== Construct compile classpath =============================== -->
-    <path id="compile.classpath">
-        <pathelement location="${build.home}/classes"/>
-    </path>
-
-    <!-- ========== Construct unit test classpath ============================= -->
-    <path id="test.classpath">
-        <pathelement location="${build.home}/classes"/>
-        <pathelement location="${build.home}/tests"/>
-        <pathelement location="${junit.jar}"/>
-        <pathelement location="${hamcrest.jar}"/>        
-        <pathelement location="${easymock.jar}"/>
-    </path>
-
-    <!-- ========== Executable Targets ======================================== -->
-    <target name="init" description="Initialize and evaluate conditionals">
-        <echo message="-------- ${component.name} ${component.version} --------"/>
-        <filter token="name" value="${component.name}"/>
-        <filter token="package" value="${component.package}"/>
-        <filter token="version" value="${component.version}"/>
-        <filter token="compile.source" value="${compile.source}"/>
-        <filter token="compile.target" value="${compile.target}"/>
-        <mkdir dir="${build.home}"/>
-    </target>
-
-    <!-- ========== Compile Targets ========================================= -->
-    <target name="compile" depends="init" description="Compile shareable components">
-        <mkdir dir="${build.home}/classes"/>
-        <javac srcdir="${source.home}" destdir="${build.home}/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" target="${compile.target}" source="${compile.source}" excludes="${compile.excludes}" optimize="${compile.optimize}" includeantruntime="false" encoding="${compile.encoding}">
-            <classpath refid="compile.classpath"/>
-        </javac>
-        <copy todir="${build.home}/classes" filtering="on">
-            <fileset dir="${source.home}" excludes="**/*.java,**/*.html"/>
-        </copy>
-    </target>
-
-    <target name="compile.tests" depends="compile" description="Compile unit test cases">
-        <mkdir dir="${build.home}/tests"/>
-        <javac srcdir="${test.home}" destdir="${build.home}/tests" debug="${compile.debug}" deprecation="off" target="${compile.target}" source="${compile.source}" optimize="${compile.optimize}" includeantruntime="false" encoding="${compile.encoding}">
-            <classpath refid="test.classpath"/>
-        </javac>
-        <copy todir="${build.home}/tests" filtering="on">
-            <fileset dir="${test.home}" excludes="**/*.java"/>
-        </copy>
-    </target>
-
-    <!-- ========== Unit Tests ========================================= -->
-    <target name="test" depends="compile.tests" description="Run all unit test cases">
-        <echo message="Running unit tests ..."/>
-        <mkdir dir="${build.home}/test-reports"/>
-        <junit printsummary="true" showoutput="true" fork="yes" haltonfailure="${test.failonerror}">
-            <classpath refid="test.classpath"/>
-            <formatter type="plain" usefile="true" />
-            <!-- If test.entry is defined, run a single test, otherwise run all valid tests -->
-            <test name="${test.entry}" todir="${build.home}/test-reports" if="test.entry"/>
-            <batchtest fork="yes" todir="${build.home}/test-reports" unless="test.entry">
-                <fileset dir="${test.home}">
-                    <include name="**/*Test.java"/>
-                    <exclude name="**/*$*"/>
-                    <exclude name="**/TestUtils.java"/>
-                    <exclude name="**/Abstract*.java"/>
-                    <exclude name="**/BulkTest.java"/>
-                </fileset>
-            </batchtest>
-        </junit>
-    </target>
-
-    <target name="clean" description="Clean build and distribution directories">
-        <delete dir="${build.home}"/>
-    </target>
-
-    <target name="all" depends="clean,test,compile" description="Clean and compile all components"/>
-
-    <!-- ========== JavaDocs ========================================= -->
-    <target name="javadoc" depends="compile" description="Create component Javadoc documentation">
-        <mkdir dir="${build.home}"/>
-        <mkdir dir="${build.home}/apidocs"/>
-        <tstamp>
-            <format property="current.year" pattern="yyyy"/>
-        </tstamp>
-        <javadoc sourcepath="${source.home}" 
-                 destdir="${build.home}/apidocs" 
-                 overview="${source.home}/org/apache/commons/collections4/overview.html" 
-                 packagenames="org.apache.commons.*" 
-                 excludepackagenames="${javadoc.excludepackagenames}" 
-                 author="false" 
-                 version="true" 
-                 doctitle="&lt;h1&gt;Commons Lang ${component.version}&lt;/h1&gt;"
-                 windowtitle="Lang ${component.version}" 
-                 bottom="Copyright &amp;copy; 2001-${current.year} - Apache Software Foundation" 
-                 use="true" 
-                 encoding="${compile.encoding}"
-                 source="${compile.source}">
-            <classpath refid="compile.classpath"/>
-            <link href="${jdk.javadoc}"/>
-            <link href="${collections.javadoc}"/>
-        </javadoc>
-    </target>
-
-    <!-- ========== Jar Targets ========================================= -->
-    <target name="jar" depends="compile" description="Create jar">
-        <mkdir dir="${build.home}/classes/META-INF"/>
-        <copy file="LICENSE.txt" tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
-        <copy file="NOTICE.txt"  tofile="${build.home}/classes/META-INF/NOTICE.txt"/>
-        <jar jarfile="${build.home}/${final.name}.jar">
-            <manifest>
-                <attribute name="Specification-Title" value="Commons Collections"/>
-                <attribute name="Specification-Version" value="${component.version}"/>
-                <attribute name="Specification-Vendor" value="The Apache Software Foundation"/>
-                <attribute name="Implementation-Title" value="Commons Collections"/>
-                <attribute name="Implementation-Version" value="${component.version}"/> 
-                <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
-                <attribute name="Implementation-Vendor-Id" value="org.apache"/>
-                <attribute name="X-Compile-Source-JDK" value="${compile.source}"/>
-                <attribute name="X-Compile-Target-JDK" value="${compile.target}"/>
-            </manifest>
-            <fileset dir="${build.home}/classes">
-                <include name="**/*.class"/>
-                <include name="**/LICENSE.txt"/>
-                <include name="**/NOTICE.txt"/>
-            </fileset>
-        </jar>
-    </target>
-
-    <target name="javadoc-jar" depends="javadoc" description="Create JavaDoc jar">
-        <jar jarfile="${build.home}/${final.name}-javadoc.jar">
-            <manifest>
-                <attribute name="Specification-Title" value="Commons Collections API"/>
-                <attribute name="Specification-Version" value="${component.version}"/>
-                <attribute name="Specification-Vendor" value="The Apache Software Foundation"/>
-                <attribute name="Implementation-Title" value="Commons Collections API"/>
-                <attribute name="Implementation-Version" value="${component.version}"/> 
-                <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
-                <attribute name="Implementation-Vendor-Id" value="org.apache"/>
-            </manifest>
-            <fileset dir="${build.home}/apidocs"/>
-            <fileset dir="${basedir}">
-                <include name="LICENSE.txt"/>
-                <include name="NOTICE.txt"/>
-            </fileset>
-        </jar>
-    </target>
-
-    <target name="source-jar" depends="init" description="Create Source jar">
-        <jar jarfile="${build.home}/${final.name}-sources.jar">
-            <manifest>
-                <attribute name="Specification-Title" value="Commons Collections Source"/>
-                <attribute name="Specification-Version" value="${component.version}"/>
-                <attribute name="Specification-Vendor" value="The Apache Software Foundation"/>
-                <attribute name="Implementation-Title" value="Commons Collections Source"/>
-                <attribute name="Implementation-Version" value="${component.version}"/> 
-                <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
-                <attribute name="Implementation-Vendor-Id" value="org.apache"/>
-            </manifest>
-            <fileset dir="${source.home}">
-                <include name="**/*.java"/>
-            </fileset>
-            <fileset dir="${basedir}">
-                <include name="LICENSE.txt"/>
-                <include name="NOTICE.txt"/>
-            </fileset>
-        </jar>
-    </target>
-
-    <target name="test-jar" depends="init" description="Create Testframework jar">
-        <jar jarfile="${build.home}/${final.name}-tests.jar">
-            <manifest>
-                <attribute name="Specification-Title" value="Commons Collections Testframework"/>
-                <attribute name="Specification-Version" value="${component.version}"/>
-                <attribute name="Specification-Vendor" value="The Apache Software Foundation"/>
-                <attribute name="Implementation-Title" value="Commons Collections Testframework"/>
-                <attribute name="Implementation-Version" value="${component.version}"/> 
-                <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
-                <attribute name="Implementation-Vendor-Id" value="org.apache"/>
-            </manifest>
-            <fileset dir="${test.home}">
-                <include name="**/*.java"/>
-            </fileset>
-            <fileset dir="${basedir}">
-                <include name="LICENSE.txt"/>
-                <include name="NOTICE.txt"/>
-            </fileset>
-        </jar>
-    </target>
-    
-    <!-- ========== Distribution ========================================= -->
-    <target name="dist" depends="clean,jar,source-jar,javadoc-jar,test-jar" description="Create binary distribution">
-
-        <!-- binary distro -->
-        <zip destfile="${build.home}/${final.name}.zip">
-            <zipfileset dir="${basedir}" prefix="${final.name}"
-                      includes="LICENSE.txt,
-                                NOTICE.txt,
-                                RELEASE-NOTES.txt"
-             />
-            <zipfileset dir="${build.home}" includes="*.jar," prefix="${final.name}"/>
-            <zipfileset dir="${build.home}/apidocs" prefix="${final.name}/apidocs"/>
-        </zip>
-        <tar destfile="${build.home}/${final.name}.tar.gz" compression="gzip">
-            <zipfileset src="${build.home}/${final.name}.zip"/>
-        </tar>
-
-        <!-- source distro -->
-        <zip destfile="${build.home}/${final.name}-src.zip">
-            <zipfileset dir="${basedir}" prefix="${final.name}-src"
-                      includes="build.xml,
-                                default.properties,
-                                build.properties.sample,
-                                DEVELOPERS-GUIDE.html,
-                                PROPOSAL.html,
-                                LICENSE.txt,
-                                NOTICE.txt,
-                                README.txt,
-                                pom.xml,
-                                RELEASE-NOTES.txt"
-             />
-            <zipfileset dir="${basedir}/src"   prefix="${final.name}-src/src"/>
-        </zip>
-        <tar destfile="${build.home}/${final.name}-src.tar.gz" compression="gzip">
-            <zipfileset src="${build.home}/${final.name}-src.zip"/>
-        </tar>
-
-    </target>
-</project>
diff -Nru libcommons-collections4-java-4.1/CONTRIBUTING.md libcommons-collections4-java-4.2/CONTRIBUTING.md
--- libcommons-collections4-java-4.1/CONTRIBUTING.md	2015-04-08 18:44:36.000000000 +0000
+++ libcommons-collections4-java-4.2/CONTRIBUTING.md	2018-07-08 00:18:18.000000000 +0000
@@ -50,48 +50,66 @@
 
 + Make sure you have a [JIRA account](https://issues.apache.org/jira/).
 + Make sure you have a [GitHub account](https://github.com/signup/free).
-+ If you're planning to implement a new feature it makes sense to discuss you're changes on the [dev list](https://commons.apache.org/mail-lists.html) first. This way you can make sure you're not wasting your time on something that isn't considered to be in Apache Commons Collections's scope.
-+ Submit a ticket for your issue, assuming one does not already exist.
++ If you're planning to implement a new feature it makes sense to discuss your changes on the [dev list](https://commons.apache.org/mail-lists.html) first. This way you can make sure you're not wasting your time on something that isn't considered to be in Apache Commons Collections's scope.
++ Submit a [Jira Ticket][jira] for your issue, assuming one does not already exist.
   + Clearly describe the issue including steps to reproduce when it is a bug.
   + Make sure you fill in the earliest version that you know has the issue.
-+ Fork the repository on GitHub.
++ Find the corresponding [repository on GitHub](https://github.com/apache/?query=commons-),
+[fork](https://help.github.com/articles/fork-a-repo/) and check out your forked repository.
 
 Making Changes
 --------------
 
-+ Create a topic branch from where you want to base your work (this is usually the master/trunk branch).
++ Create a _topic branch_ for your isolated work.
+  * Usually you should base your branch on the `master` or `trunk` branch.
+  * A good topic branch name can be the JIRA bug id plus a keyword, e.g. `COLLECTIONS-123-InputStream`.
+  * If you have submitted multiple JIRA issues, try to maintain separate branches and pull requests.
 + Make commits of logical units.
+  * Make sure your commit messages are meaningful and in the proper format. Your commit message should contain the key of the JIRA issue.
+  * e.g. `COLLECTIONS-123: Close input stream earlier`
 + Respect the original code style:
   + Only use spaces for indentation.
-  + Create minimal diffs - disable on save actions like reformat source code or organize imports. If you feel the source code should be reformatted create a separate PR for this change.
-  + Check for unnecessary whitespace with git diff --check before committing.
-+ Make sure your commit messages are in the proper format. Your commit message should contain the key of the JIRA issue.
-+ Make sure you have added the necessary tests for your changes.
+  + Create minimal diffs - disable _On Save_ actions like _Reformat Source Code_ or _Organize Imports_. If you feel the source code should be reformatted create a separate PR for this change first.
+  + Check for unnecessary whitespace with `git diff` -- check before committing.
++ Make sure you have added the necessary tests for your changes, typically in `src/test/java`.
 + Run all the tests with `mvn clean verify` to assure nothing else was accidentally broken.
 
 Making Trivial Changes
 ----------------------
 
+The JIRA tickets are used to generate the changelog for the next release.
+
 For changes of a trivial nature to comments and documentation, it is not always necessary to create a new ticket in JIRA.
 In this case, it is appropriate to start the first line of a commit with '(doc)' instead of a ticket number.
 
+
 Submitting Changes
 ------------------
 
-+ Sign the [Contributor License Agreement][cla] if you haven't already.
++ Sign and submit the Apache [Contributor License Agreement][cla] if you haven't already.
+  * Note that small patches & typical bug fixes do not require a CLA as
+    clause 5 of the [Apache License](https://www.apache.org/licenses/LICENSE-2.0.html#contributions)
+    covers them.
 + Push your changes to a topic branch in your fork of the repository.
-+ Submit a pull request to the repository in the apache organization.
++ Submit a _Pull Request_ to the corresponding repository in the `apache` organization.
+  * Verify _Files Changed_ shows only your intended changes and does not
+  include additional files like `target/*.class`
 + Update your JIRA ticket and include a link to the pull request in the ticket.
 
+If you prefer to not use GitHub, then you can instead use
+`git format-patch` (or `svn diff`) and attach the patch file to the JIRA issue.
+
+
 Additional Resources
 --------------------
 
 + [Contributing patches](https://commons.apache.org/patches.html)
-+ [Apache Commons Collections JIRA project page](https://issues.apache.org/jira/browse/COLLECTIONS)
++ [Apache Commons Collections JIRA project page][jira]
 + [Contributor License Agreement][cla]
 + [General GitHub documentation](https://help.github.com/)
-+ [GitHub pull request documentation](https://help.github.com/send-pull-requests/)
++ [GitHub pull request documentation](https://help.github.com/articles/creating-a-pull-request/)
 + [Apache Commons Twitter Account](https://twitter.com/ApacheCommons)
-+ #apachecommons IRC channel on freenode.org
++ `#apache-commons` IRC channel on `irc.freenode.net`
 
 [cla]:https://www.apache.org/licenses/#clas
+[jira]:https://issues.apache.org/jira/browse/COLLECTIONS
diff -Nru libcommons-collections4-java-4.1/debian/changelog libcommons-collections4-java-4.2/debian/changelog
--- libcommons-collections4-java-4.1/debian/changelog	2015-12-06 21:47:29.000000000 +0000
+++ libcommons-collections4-java-4.2/debian/changelog	2019-02-26 14:40:13.000000000 +0000
@@ -1,3 +1,21 @@
+libcommons-collections4-java (4.2-1~18.04) bionic; urgency=medium
+
+  * Backport for OpenJDK 11. LP: #1814133.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 26 Feb 2019 15:40:13 +0100
+
+libcommons-collections4-java (4.2-1) unstable; urgency=medium
+
+  * New upstream release
+  * Fixed the build failure with Java 11 (Closes: #912477)
+  * Added the OSGi metadata
+  * Standards-Version updated to 4.2.1
+  * Switch to debhelper level 11
+  * Use salsa.debian.org Vcs-* URLs
+  * Track and download the new releases from the GitHub mirror
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Tue, 06 Nov 2018 16:47:50 +0100
+
 libcommons-collections4-java (4.1-1) unstable; urgency=medium
 
   * New upstream release
diff -Nru libcommons-collections4-java-4.1/debian/compat libcommons-collections4-java-4.2/debian/compat
--- libcommons-collections4-java-4.1/debian/compat	2015-12-06 21:32:22.000000000 +0000
+++ libcommons-collections4-java-4.2/debian/compat	2018-11-06 15:38:42.000000000 +0000
@@ -1 +1 @@
-9
+11
diff -Nru libcommons-collections4-java-4.1/debian/control libcommons-collections4-java-4.2/debian/control
--- libcommons-collections4-java-4.1/debian/control	2015-12-06 21:47:29.000000000 +0000
+++ libcommons-collections4-java-4.2/debian/control	2018-11-06 15:38:42.000000000 +0000
@@ -3,14 +3,19 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Emmanuel Bourg <ebourg@apache.org>
-Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.5)
-Build-Depends-Indep: default-jdk-doc,
-                     junit4,
-                     libeasymock-java,
-                     libmaven-javadoc-plugin-java
-Standards-Version: 3.9.6
-Vcs-Git: git://anonscm.debian.org/pkg-java/libcommons-collections4-java.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libcommons-collections4-java.git
+Build-Depends:
+ debhelper (>= 11),
+ default-jdk,
+ default-jdk-doc,
+ junit4,
+ libcommons-parent-java (>= 39-3~),
+ libeasymock-java,
+ libmaven-bundle-plugin-java,
+ libmaven-javadoc-plugin-java,
+ maven-debian-helper (>= 2.0.2~)
+Standards-Version: 4.2.1
+Vcs-Git: https://salsa.debian.org/java-team/libcommons-collections4-java.git
+Vcs-Browser: https://salsa.debian.org/java-team/libcommons-collections4-java
 Homepage: http://commons.apache.org/collections/
 
 Package: libcommons-collections4-java
diff -Nru libcommons-collections4-java-4.1/debian/libcommons-collections4-java.poms libcommons-collections4-java-4.2/debian/libcommons-collections4-java.poms
--- libcommons-collections4-java-4.1/debian/libcommons-collections4-java.poms	2015-12-06 21:49:04.000000000 +0000
+++ libcommons-collections4-java-4.2/debian/libcommons-collections4-java.poms	2018-11-06 15:38:42.000000000 +0000
@@ -25,4 +25,4 @@
 #   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
 #     Empty by default. [mh_install]
 #
-pom.xml --no-parent --has-package-version
+pom.xml --has-package-version
diff -Nru libcommons-collections4-java-4.1/debian/maven.properties libcommons-collections4-java-4.2/debian/maven.properties
--- libcommons-collections4-java-4.1/debian/maven.properties	2015-12-06 21:32:22.000000000 +0000
+++ libcommons-collections4-java-4.2/debian/maven.properties	2018-11-06 15:47:50.000000000 +0000
@@ -2,5 +2,4 @@
 # For example:
 # maven.test.skip=true
 
-maven.compiler.source=1.6
-maven.compiler.target=1.6
+maven.compiler.release=7
diff -Nru libcommons-collections4-java-4.1/debian/orig-tar.sh libcommons-collections4-java-4.2/debian/orig-tar.sh
--- libcommons-collections4-java-4.1/debian/orig-tar.sh	2015-12-06 21:32:22.000000000 +0000
+++ libcommons-collections4-java-4.2/debian/orig-tar.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-set -e
-
-PACKAGE=$(dpkg-parsechangelog -S Source)
-VERSION=$2
-TAR=../${PACKAGE}_${VERSION}.orig.tar.xz
-DIR=${PACKAGE}_${VERSION}
-TAG=$(echo "COLLECTIONS_$VERSION" | sed -re's,\.,_,')
-
-svn export http://svn.apache.org/repos/asf/commons/proper/collections/tags/${TAG} $DIR
-XZ_OPT=--best tar -c -J -f $TAR $DIR
-rm -rf $DIR ../$TAG
diff -Nru libcommons-collections4-java-4.1/debian/rules libcommons-collections4-java-4.2/debian/rules
--- libcommons-collections4-java-4.1/debian/rules	2015-12-06 21:47:20.000000000 +0000
+++ libcommons-collections4-java-4.2/debian/rules	2018-11-06 15:38:42.000000000 +0000
@@ -8,5 +8,3 @@
 override_dh_installchangelogs:
 	dh_installchangelogs RELEASE-NOTES.txt
 
-get-orig-source:
-	uscan --download-current-version --force-download --no-symlink
diff -Nru libcommons-collections4-java-4.1/debian/watch libcommons-collections4-java-4.2/debian/watch
--- libcommons-collections4-java-4.1/debian/watch	2015-12-06 21:32:22.000000000 +0000
+++ libcommons-collections4-java-4.2/debian/watch	2018-11-06 15:47:50.000000000 +0000
@@ -1,4 +1,3 @@
-version=3
-opts="uversionmangle=s/_/./" \
-  http://svn.apache.org/viewvc/commons/proper/collections/tags/ COLLECTIONS_([\d_]*)/ \
-  debian debian/orig-tar.sh
+version=4
+opts="repack,compression=xz" \
+https://github.com/apache/commons-collections/tags .*/commons-collections-([\d.]+).tar.gz
diff -Nru libcommons-collections4-java-4.1/default.properties libcommons-collections4-java-4.2/default.properties
--- libcommons-collections4-java-4.1/default.properties	2015-11-25 21:52:13.000000000 +0000
+++ libcommons-collections4-java-4.2/default.properties	1970-01-01 00:00:00.000000000 +0000
@@ -1,87 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-# 
-#      http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# $Id: default.properties 1716550 2015-11-25 21:52:13Z tn $
-
-# The location of the "junit.jar" JAR file
-junit.jar = ${junit.home}/junit-4.11.jar
-
-# The location of the "junit.jar" JAR file
-hamcrest.jar = ${hamcrest.home}/hamcrest-core-1.3.jar
-
-# The location of the Easymock jar
-easymock.jar = ${easymock.home}/easymock-3.2.jar
-
-# Whether or not to fork tests
-junit.fork = true
-
-# The name of this component
-component.name = commons-collections4
-
-# The primary package name of this component
-component.package = org.apache.commons.collections4
-
-# The title of this component
-component.title = Commons Collections
-
-# The current version number of this component
-component.version = 4.1
-
-# The name that is used to create the jar file
-final.name = ${component.name}-${component.version}
-
-# The base directory for compilation targets
-build.home = target
-
-# The base directory for component configuration files
-conf.home = src/conf
-
-# The base directory for component sources
-source.home = src/main/java
-
-# The base directory for unit test sources
-test.home = src/test/java
-
-# Should Java compilations set the 'debug' compiler option?
-compile.debug = true
-
-# Should Java compilations set the 'deprecation' compiler option?
-compile.deprecation = true
-
-# Should Java compilations set the 'optimize' compiler option?
-compile.optimize = true
-
-# Generate class files for specific VM version (e.g., 1.1 or 1.2). 
-# Note that the default value depends on the JVM that is running Ant. 
-# In particular, if you use JDK 1.4+ the generated classes will not be usable
-# for a 1.1 Java VM unless you explicitly set this attribute to the value 1.1 
-# (which is the default value for JDK 1.1 to 1.3).
-compile.target = 1.6
-
-# Specifies the source version for the Java compiler.
-# Corresponds to the source attribute for the ant javac task. 
-# Valid values are 1.3, 1.4, 1.5. 
-compile.source = 1.6
-
-# Specifies the source encoding.
-compile.encoding = ISO-8859-1
-
-# Should all tests fail if one does?
-test.failonerror = true
-
-# The test runner to execute
-test.runner = junit.textui.TestRunner
diff -Nru libcommons-collections4-java-4.1/DEVELOPERS-GUIDE.html libcommons-collections4-java-4.2/DEVELOPERS-GUIDE.html
--- libcommons-collections4-java-4.1/DEVELOPERS-GUIDE.html	2012-06-23 15:49:16.000000000 +0000
+++ libcommons-collections4-java-4.2/DEVELOPERS-GUIDE.html	2018-07-08 00:18:18.000000000 +0000
@@ -24,7 +24,7 @@
 <div align="center">
 <h1>The Apache Commons <em>Collections</em> Package</h1>
 <h2>Developers Guide</h2>
-$Id: DEVELOPERS-GUIDE.html 1353152 2012-06-23 15:49:16Z tn $<br />
+$Id$<br />
 <a href="#Introduction">[Introduction]</a>
 <a href="#CollectionInterfaces">[Collection Interfaces]</a>
 <a href="#CollectionImplementations">[Collection Implementations]</a>
diff -Nru libcommons-collections4-java-4.1/doap_collections.rdf libcommons-collections4-java-4.2/doap_collections.rdf
--- libcommons-collections4-java-4.1/doap_collections.rdf	2015-11-14 13:37:20.000000000 +0000
+++ libcommons-collections4-java-4.2/doap_collections.rdf	1970-01-01 00:00:00.000000000 +0000
@@ -1,80 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<rdf:RDF xmlns="http://usefulinc.com/ns/doap#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:asfext="http://projects.apache.org/ns/asfext#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" xmlns:doap="http://usefulinc.com/ns/doap#" xml:lang="en">
-  <Project rdf:about="http://commons.apache.org/collections/">
-    <name>Apache Commons Collections</name>
-    <homepage rdf:resource="http://commons.apache.org/collections/"/>
-    <programming-language>Java</programming-language>
-    <category rdf:resource="http://projects.apache.org/category/library"/>
-    <license rdf:resource="http://usefulinc.com/doap/licenses/asl20"/>
-    <bug-database rdf:resource="http://issues.apache.org/jira/browse/COLLECTIONS"/>
-    <download-page rdf:resource="http://commons.apache.org/collections/download_collections.cgi"/>
-    <asfext:pmc rdf:resource="http://commons.apache.org/"/>
-    <shortdesc xml:lang="en">Commons Collections</shortdesc>
-    <description xml:lang="en">Types that extend and augment the Java Collections Framework.</description>
-    <repository>
-      <SVNRepository>
-        <browse rdf:resource="http://svn.apache.org/repos/asf/commons/proper/collections/trunk"/>
-        <location rdf:resource="http://svn.apache.org/repos/asf/commons/proper/collections"/>
-      </SVNRepository>
-    </repository>
-    <release>
-      <Version>
-        <name>commons-collections</name>
-        <created>2013-11-24</created>
-        <revision>4.0</revision>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>commons-collections</name>
-        <created>2015-11-14</created>
-        <revision>3.2.2</revision>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>commons-collections</name>
-        <created>2008-04-15</created>
-        <revision>3.2.1</revision>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>commons-collections</name>
-        <created>2006-05-14</created>
-        <revision>3.2</revision>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>commons-collections</name>
-        <created>2004-06-23</created>
-        <revision>3.1</revision>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>commons-collections</name>
-        <created>2004-06-23</created>
-        <revision>2.1.1</revision>
-      </Version>
-    </release>
-    <mailing-list rdf:resource="http://commons.apache.org/mail-lists.html"/>
-  </Project>
-</rdf:RDF>
diff -Nru libcommons-collections4-java-4.1/NOTICE.txt libcommons-collections4-java-4.2/NOTICE.txt
--- libcommons-collections4-java-4.1/NOTICE.txt	2015-01-07 21:02:51.000000000 +0000
+++ libcommons-collections4-java-4.2/NOTICE.txt	2018-07-08 00:18:18.000000000 +0000
@@ -1,5 +1,5 @@
 Apache Commons Collections
-Copyright 2001-2015 The Apache Software Foundation
+Copyright 2001-2018 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
diff -Nru libcommons-collections4-java-4.1/pom.xml libcommons-collections4-java-4.2/pom.xml
--- libcommons-collections4-java-4.1/pom.xml	2015-11-25 21:52:13.000000000 +0000
+++ libcommons-collections4-java-4.2/pom.xml	2018-07-08 00:18:18.000000000 +0000
@@ -19,12 +19,11 @@
   <parent>
     <groupId>org.apache.commons</groupId>
     <artifactId>commons-parent</artifactId>
-    <version>38</version>
+    <version>47</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.commons</groupId>
   <artifactId>commons-collections4</artifactId>
-  <version>4.1</version>
+  <version>4.2</version>
   <name>Apache Commons Collections</name>
 
   <inceptionYear>2001</inceptionYear>
@@ -38,9 +37,9 @@
   </issueManagement>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/collections/trunk</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/collections/trunk</developerConnection>
-    <url>http://svn.apache.org/viewvc/commons/proper/collections/trunk</url>
+    <connection>scm:git:http://git-wip-us.apache.org/repos/asf/commons-collections.git</connection>
+    <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/commons-collections.git</developerConnection>
+    <url>https://git-wip-us.apache.org/repos/asf?p=commons-collections.git</url>
   </scm>
 
   <developers>
@@ -65,7 +64,7 @@
       <id>morgand</id>
     </developer>
     <developer>
-      <name>Gary D. Gregory</name>
+      <name>Gary Gregory</name>
       <id>ggregory</id>
     </developer>
     <developer>
@@ -97,10 +96,6 @@
       <id>adriannistor</id>
     </developer>
     <developer>
-      <name>Phil Steitz</name>
-      <id>psteitz</id>
-    </developer>
-    <developer>
       <name>Arun M. Thomas</name>
       <id>amamment</id>
     </developer>
@@ -112,6 +107,10 @@
       <name>Henri Yandell</name>
       <id>bayard</id>
     </developer>
+    <developer>
+      <name>Rob Tompkins</name>
+      <id>chtompki</id>
+    </developer>
   </developers>
 
   <contributors>
@@ -436,19 +435,28 @@
     <contributor>
       <name>Goncalo Marques</name>
     </contributor>
+    <contributor>
+      <name>Vamsi Kavuri</name>
+    </contributor>
   </contributors>
 
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.11</version>
+      <version>4.12</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
-      <version>3.2</version>
+      <version>3.6</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.7</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -464,11 +472,11 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <maven.compiler.source>1.6</maven.compiler.source>
-    <maven.compiler.target>1.6</maven.compiler.target>
+    <maven.compiler.source>1.7</maven.compiler.source>
+    <maven.compiler.target>1.7</maven.compiler.target>
 
     <!--
-       This is also  used to generate download_xxx file name.
+       This is also used to generate download_xxx file name.
        To override this when generating the download page:
 
        mvn commons:download-page -Dcommons.componentid=collections
@@ -476,35 +484,49 @@
        The above seems to change the download page name but not any other
        properties that depend on the componentid.
     -->
-    <commons.componentid>collections4</commons.componentid>
+    <commons.componentid>collections</commons.componentid>
+    <commons.module.name>org.apache.commons.collections4</commons.module.name>
 
     <!-- Current 4.x release series -->
-    <commons.release.version>4.1</commons.release.version>
-    <commons.release.desc>(Java 6.0+)</commons.release.desc>
+    <commons.release.version>4.2</commons.release.version>
+    <commons.release.desc>(Requires Java 7 or later)</commons.release.desc>
 
     <!-- Previous 3.x release series -->
-    <commons.release.2.version>3.2.2</commons.release.2.version>
-    <commons.release.2.desc>(Requires Java 1.3 or later)</commons.release.2.desc>
+    <commons.release.2.version>4.1</commons.release.2.version>
+    <commons.release.2.desc>(Requires Java 6 or later)</commons.release.2.desc>
     <!-- Override generated name -->
     <commons.release.2.name>commons-collections-${commons.release.2.version}</commons.release.2.name>
 
+    <!-- Previous 3.x release series -->
+    <commons.release.3.version>3.2.2</commons.release.3.version>
+    <commons.release.3.desc>(Requires Java 1.3 or later)</commons.release.3.desc>
+    <!-- Override generated name -->
+    <commons.release.3.name>commons-collections-${commons.release.3.version}</commons.release.3.name>
+
     <commons.jira.id>COLLECTIONS</commons.jira.id>
     <commons.jira.pid>12310465</commons.jira.pid>
     <!-- The RC version used in the staging repository URL. -->
-    <commons.rc.version>RC2</commons.rc.version>
-    <checkstyle.version>2.9.1</checkstyle.version>
+    <commons.rc.version>RC1</commons.rc.version>
+    <checkstyle.version>3.0.0</checkstyle.version>
 
     <commons.site.path>collections</commons.site.path>
     <commons.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/commons/content/proper/commons-collections</commons.scmPubUrl>
     <commons.scmPubCheckoutDirectory>site-content</commons.scmPubCheckoutDirectory>
 
-    <!-- Override javadoc plugin version due to a vulnerability of the generated javadoc
-         see http://jira.codehaus.org/browse/MJAVADOC-370, remove after update to CP 32   -->
-    <commons.javadoc.version>2.9.1</commons.javadoc.version>
+    <!-- Override clirr version to enable clirr on Java 8 -->
+    <commons.clirr.version>2.8</commons.clirr.version>
+    
+    <!--Commons Release Plugin -->
+    <commons.bc.version>4.1</commons.bc.version>
+    <commons.release.isDistModule>true</commons.release.isDistModule>
+    <commons.releaseManagerName>Gary Gregory</commons.releaseManagerName>
+    <commons.releaseManagerKey>86FDC7E2A11262CB</commons.releaseManagerKey>
+    
   </properties>
 
 
   <build>
+    <defaultGoal>clean verify apache-rat:check clirr:check javadoc:javadoc</defaultGoal>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -532,11 +554,22 @@
         </configuration>
       </plugin>
       <plugin>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+        <configuration>
+          <excludes>
+            <exclude>site-content/**/*</exclude>
+            <exclude>src/test/resources/data/test/*</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+      <plugin>
         <artifactId>maven-checkstyle-plugin</artifactId>
         <version>${checkstyle.version}</version>
         <configuration>
           <configLocation>${basedir}/src/conf/checkstyle.xml</configLocation>
           <enableRulesSummary>false</enableRulesSummary>
+          <suppressionsLocation>${basedir}/src/conf/checkstyle-suppressions.xml</suppressionsLocation>
         </configuration>
       </plugin>
       <plugin>
@@ -548,6 +581,25 @@
           </ignorePathsToDelete>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
+        <!-- Temporary fix for COLLECTIONS-658, remove this after this has implemented in parent pom -->
+        <configuration>
+          <archive combine.children="append">
+            <manifestEntries>
+              <Automatic-Module-Name>org.apache.commons.collections4</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 
@@ -609,7 +661,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>findbugs-maven-plugin</artifactId>
-        <version>2.5.5</version>
+        <version>${commons.findbugs.version}</version>
         <configuration>
           <threshold>Normal</threshold>
           <effort>Default</effort>
@@ -618,7 +670,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-pmd-plugin</artifactId>
-        <version>2.7.1</version>
+        <version>3.10.0</version>
         <configuration>
           <targetJdk>${maven.compiler.target}</targetJdk>
         </configuration>
@@ -631,18 +683,6 @@
           </reportSet>
         </reportSets>
       </plugin>
-      <plugin>
-        <groupId>org.apache.rat</groupId>
-        <artifactId>apache-rat-plugin</artifactId>
-        <configuration>
-          <excludes>
-            <exclude>site-content/**/*</exclude>
-            <exclude>src/test/resources/data/test/*</exclude>
-            <exclude>maven-eclipse.xml</exclude>
-            <exclude>.travis.yml</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
     </plugins>
   </reporting>
 
@@ -659,7 +699,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-antrun-plugin</artifactId>
-            <version>1.7</version>
+            <version>1.8</version>
             <executions>
               <execution>
                 <id>prepare-checkout</id>
@@ -691,40 +731,17 @@
         </plugins>
       </build>
     </profile>
-
     <profile>
-      <id>travis</id>
+      <id>java9</id>
       <activation>
-        <property>
-          <name>env.TRAVIS</name>
-          <value>true</value>
-        </property>
+        <jdk>9</jdk>
       </activation>
       <properties>
-        <buildnumber.skip>true</buildnumber.skip>
+        <!-- versions below 3.0.0 do not work with java 9 -->
+        <commons.javadoc.version>3.0.1</commons.javadoc.version>
+        <!-- coverall version 4.3.0 does not work with java 9, see https://github.com/trautonen/coveralls-maven-plugin/issues/112 -->
+        <coveralls.skip>true</coveralls.skip>
       </properties>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.jacoco</groupId>
-            <artifactId>jacoco-maven-plugin</artifactId>
-            <version>${commons.jacoco.version}</version>
-            <executions>
-              <execution>
-                <id>prepare-agent</id>
-                <goals>
-                  <goal>prepare-agent</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.eluder.coveralls</groupId>
-            <artifactId>coveralls-maven-plugin</artifactId>
-            <version>3.1.0</version>
-          </plugin>
-        </plugins>
-      </build>
     </profile>
   </profiles>
 
diff -Nru libcommons-collections4-java-4.1/README.md libcommons-collections4-java-4.2/README.md
--- libcommons-collections4-java-4.1/README.md	2015-11-25 19:39:02.000000000 +0000
+++ libcommons-collections4-java-4.2/README.md	2018-07-08 00:18:18.000000000 +0000
@@ -43,18 +43,18 @@
 Apache Commons Collections
 ===================
 
-[![Build Status](https://travis-ci.org/apache/commons-collections.svg?branch=trunk)](https://travis-ci.org/apache/commons-collections)
-[![Coverage Status](https://coveralls.io/repos/apache/commons-collections/badge.svg?branch=trunk&service=github)](https://coveralls.io/github/apache/commons-collections?branch=trunk)
+[![Build Status](https://travis-ci.org/apache/commons-collections.svg)](https://travis-ci.org/apache/commons-collections)
+[![Coverage Status](https://coveralls.io/repos/apache/commons-collections/badge.svg)](https://coveralls.io/r/apache/commons-collections)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-collections4/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-collections4/)
-[![License](http://img.shields.io/:license-apache-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0.html)
+[![Javadocs](https://javadoc.io/badge/org.apache.commons/commons-collections4/4.2.svg)](https://javadoc.io/doc/org.apache.commons/commons-collections4/4.2)
 
 The Apache Commons Collections package contains types that extend and augment the Java Collections Framework.
 
 Documentation
 -------------
 
-More information can be found on the [homepage](https://commons.apache.org/proper/commons-collections).
-The [JavaDoc](https://commons.apache.org/proper/commons-collections/javadocs/api-release) can be browsed.
+More information can be found on the [Apache Commons Collections homepage](https://commons.apache.org/proper/commons-collections).
+The [Javadoc](https://commons.apache.org/proper/commons-collections/javadocs/api-release) can be browsed.
 Questions related to the usage of Apache Commons Collections should be posted to the [user mailing list][ml].
 
 Where can I get the latest release?
@@ -67,14 +67,14 @@
 <dependency>
   <groupId>org.apache.commons</groupId>
   <artifactId>commons-collections4</artifactId>
-  <version>4.0</version>
+  <version>4.2</version>
 </dependency>
 ```
 
 Contributing
 ------------
 
-We accept PRs via github. The [developer mailing list][ml] is the main channel of communication for contributors.
+We accept Pull Requests via GitHub. The [developer mailing list][ml] is the main channel of communication for contributors.
 There are some guidelines which will make applying PRs easier for us:
 + No tabs! Please use spaces for indentation.
 + Respect the code style.
@@ -86,7 +86,9 @@
 
 License
 -------
-Code is under the [Apache Licence v2](https://www.apache.org/licenses/LICENSE-2.0.txt).
+This code is under the [Apache Licence v2](https://www.apache.org/licenses/LICENSE-2.0).
+
+See the `NOTICE.txt` file for required notices and attributions.
 
 Donations
 ---------
@@ -96,8 +98,8 @@
 --------------------
 
 + [Apache Commons Homepage](https://commons.apache.org/)
-+ [Apache Bugtracker (JIRA)](https://issues.apache.org/jira/)
++ [Apache Issue Tracker (JIRA)](https://issues.apache.org/jira/browse/COLLECTIONS)
 + [Apache Commons Twitter Account](https://twitter.com/ApacheCommons)
-+ #apachecommons IRC channel on freenode.org
++ `#apache-commons` IRC channel on `irc.freenode.org`
 
 [ml]:https://commons.apache.org/mail-lists.html
diff -Nru libcommons-collections4-java-4.1/RELEASE-NOTES.txt libcommons-collections4-java-4.2/RELEASE-NOTES.txt
--- libcommons-collections4-java-4.1/RELEASE-NOTES.txt	2015-11-22 00:37:47.000000000 +0000
+++ libcommons-collections4-java-4.2/RELEASE-NOTES.txt	2018-07-08 00:18:18.000000000 +0000
@@ -1,3 +1,51 @@
+              Apache Apache Commons Collections 4.2 RELEASE NOTES
+
+The Apache Commons Collections package contains types that extend and augment the Java Collections Framework.
+
+Update from Java 6 to Java 7, bug fixes, and small changes.
+
+Changes in this version include:
+
+New features:
+o COLLECTIONS-681:  Add test for MultiSetUtils Thanks to Stephan Fuhrmann. 
+o COLLECTIONS-658:  Add Automatic-Module-Name MANIFEST entry for Java 9 compatibility. 
+o COLLECTIONS-589:  Add null-safe MapUtils.size(Map<?, ?>) method. Thanks to Gary Gregory. 
+o COLLECTIONS-586:  PatriciaTrie prefixMap clear throws NullPointerException. Thanks to Shailender Bathula, Gary Gregory. 
+o COLLECTIONS-654:  Add class SortedProperties to sort keys. 
+o COLLECTIONS-668:  Add CollectionUtils containsAny method for primitive array: org.apache.commons.collections4.CollectionUtils.containsAny(Collection<?>, T...). Thanks to Gary Gregory. 
+o COLLECTIONS-575:  Synchronized queue wrapper in QueueUtils. Thanks to Guram Savinov, Grzegorz Rożniecki, Bruno P. Kinoshita, Gary Gregory. 
+o COLLECTIONS-670:  Add org.apache.commons.collections4.IteratorUtils.first(Iterator). Thanks to Gary Gregory. 
+o COLLECTIONS-671:  Add org.apache.commons.collections4.IterableUtils.first(Iterable). Thanks to Gary Gregory. 
+
+Fixed Bugs:
+o COLLECTIONS-599:  HashEntry array object naming data initialized with double the size during deserialization. Thanks to Tejas Patel, Saleem Akbar, Gary Gregory. 
+o COLLECTIONS-662:  Unit tests MapUtilsTest and ListIteratorWrapperTest no longer fail on Java 9. Thanks to Vamsi Kavuri. 
+o COLLECTIONS-661:  Intermittent test failures in Windows for HashSetValuedHashMap. 
+o COLLECTIONS-660:  Uncomment test in AbstractMapTest regarding LRUMap equals. 
+o COLLECTIONS-656:  Fix site build on Java 8. 
+o COLLECTIONS-653:  Update Javadoc to Build on Java 1.8. 
+o COLLECTIONS-606:  Build status, Coverage status and Maven central weren't in README.md Thanks to Vamsi Kavuri. 
+o COLLECTIONS-594:  Web site spelling error: MultiValuedMapeList. Thanks to Javen O'Neal. 
+o COLLECTIONS-597:  Correction of Javadoc for org.apache.commons.collections4.functors.CatchAndRethrowClosure. Thanks to Enrique. 
+o COLLECTIONS-678:  The verification of unsupported iterator methods is not complete. Thanks to Oscar Luis Vera Pérez. 
+o COLLECTIONS-673:  ListUtils.partition potential integer overflow. Thanks to John Mark, Stephan Fuhrmann. 
+
+Changes:
+o COLLECTIONS-602:  Improve efficiency of DefaultedMap.get. Thanks to John Mark. 
+o COLLECTIONS-603:  Small improvements for generics, conditional statements, and warnings suppressions. Thanks to Artem Konovalov. 
+o COLLECTIONS-655:  Update platform from Java 6 to Java 7. 
+o COLLECTIONS-666:  org.apache.commons.collections4.ListUtils.union(List, List) should pre-allocate result list. Thanks to BELUGA BEHR. 
+o COLLECTIONS-669:  Update org.apache.commons.collections4.CollectionUtils.addAll(Collection<C>, C[]) to addAll(Collection<C>, C...). Thanks to BELUGA BEHR, Gary Gregory. 
+
+ 
+For complete information on Apache Commons Collections, including instructions on how to submit bug reports,
+patches, or suggestions for improvement, see the Apache Apache Commons Collections website:
+
+http://commons.apache.org/proper/commons-collections/
+
+Download page: http://commons.apache.org/proper/commons-collections/download_pool.cgi
+
+===============================================================================
 
               Apache Commons Collections
                      Version 4.1
diff -Nru libcommons-collections4-java-4.1/src/assembly/src.xml libcommons-collections4-java-4.2/src/assembly/src.xml
--- libcommons-collections4-java-4.1/src/assembly/src.xml	2013-06-23 18:27:46.000000000 +0000
+++ libcommons-collections4-java-4.2/src/assembly/src.xml	2018-07-08 00:18:18.000000000 +0000
@@ -24,15 +24,14 @@
     <fileSets>
         <fileSet>
             <includes>
-                <include>build.xml</include>
-                <include>default.properties</include>
-                <include>build.properties.sample</include>
+                <include>.travis.yml</include>
+                <include>CONTRIBUTING.md</include>
                 <include>DEVELOPERS-GUIDE.html</include>
                 <include>LICENSE.txt</include>
                 <include>NOTICE.txt</include>
                 <include>pom.xml</include>
                 <include>PROPOSAL.html</include>
-                <include>README.txt</include>
+                <include>README.md</include>
                 <include>RELEASE-NOTES.txt</include>
             </includes>
         </fileSet>
diff -Nru libcommons-collections4-java-4.1/src/changes/changes.xml libcommons-collections4-java-4.2/src/changes/changes.xml
--- libcommons-collections4-java-4.1/src/changes/changes.xml	2015-11-22 21:20:23.000000000 +0000
+++ libcommons-collections4-java-4.2/src/changes/changes.xml	2018-07-08 00:18:18.000000000 +0000
@@ -20,7 +20,83 @@
     <title>Commons Collections Changes</title>
   </properties>
   <body>
-
+  <release version="4.2" date="2018-MM-DD" description="Update from Java 6 to Java 7, bug fixes, and small changes.">
+    <action issue="COLLECTIONS-681" dev="kinow" type="add" due-to="Stephan Fuhrmann">
+      Add test for MultiSetUtils
+    </action>
+    <action issue="COLLECTIONS-599" dev="ggregory" type="fix" due-to="Tejas Patel, Saleem Akbar, Gary Gregory">
+      HashEntry array object naming data initialized with double the size during deserialization.
+    </action>
+    <action issue="COLLECTIONS-662" dev="chtompki" type="fix" due-to="Vamsi Kavuri">
+      Unit tests MapUtilsTest and ListIteratorWrapperTest no longer fail on Java 9.
+    </action>
+    <action issue="COLLECTIONS-661" dev="kinow" type="fix">
+      Intermittent test failures in Windows for HashSetValuedHashMap.
+    </action>
+    <action issue="COLLECTIONS-660" dev="kinow" type="fix">
+      Uncomment test in AbstractMapTest regarding LRUMap equals.
+    </action>
+    <action issue="COLLECTIONS-658" dev="britter" type="add">
+      Add Automatic-Module-Name MANIFEST entry for Java 9 compatibility.
+    </action>
+    <action issue="COLLECTIONS-656" dev="ggregory" type="fix">
+      Fix site build on Java 8.
+    </action>
+    <action issue="COLLECTIONS-653" dev="kinow" type="fix">
+      Update Javadoc to Build on Java 1.8.
+    </action>
+    <action issue="COLLECTIONS-606" dev="chtompki" type="fix" due-to="Vamsi Kavuri">
+      Build status, Coverage status and Maven central weren't in README.md
+    </action>
+    <action issue="COLLECTIONS-602" dev="kinow" type="update" due-to="John Mark">
+      Improve efficiency of DefaultedMap.get.
+    </action>
+    <action issue="COLLECTIONS-603" dev="kinow" type="update" due-to="Artem Konovalov">
+      Small improvements for generics, conditional statements, and warnings suppressions.
+    </action>
+    <action issue="COLLECTIONS-655" dev="ggregory" type="update">
+      Update platform from Java 6 to Java 7.
+    </action>
+    <action issue="COLLECTIONS-594" dev="ggregory" type="fix" due-to="Javen O'Neal">
+      Web site spelling error: MultiValuedMapeList.
+    </action>
+    <action issue="COLLECTIONS-597" dev="ggregory" type="fix" due-to="Enrique">
+       Correction of Javadoc for org.apache.commons.collections4.functors.CatchAndRethrowClosure.
+    </action>
+    <action issue="COLLECTIONS-589" dev="ggregory" type="add" due-to="Gary Gregory">
+      Add null-safe MapUtils.size(Map&lt;?, ?>) method.
+    </action>
+    <action issue="COLLECTIONS-586" dev="ggregory" type="add" due-to="Shailender Bathula, Gary Gregory">
+      PatriciaTrie prefixMap clear throws NullPointerException.
+    </action>
+    <action issue="COLLECTIONS-654" dev="ggregory" type="add">
+      Add class SortedProperties to sort keys.
+    </action>
+    <action issue="COLLECTIONS-666" dev="ggregory" type="update" due-to="BELUGA BEHR">
+      org.apache.commons.collections4.ListUtils.union(List, List) should pre-allocate result list.
+    </action>
+    <action issue="COLLECTIONS-669" dev="ggregory" type="update" due-to="BELUGA BEHR, Gary Gregory">
+      Update org.apache.commons.collections4.CollectionUtils.addAll(Collection&lt;C>, C[]) to addAll(Collection&lt;C>, C...).
+    </action>
+    <action issue="COLLECTIONS-668" dev="ggregory" type="add" due-to="Gary Gregory">
+      Add CollectionUtils containsAny method for primitive array: org.apache.commons.collections4.CollectionUtils.containsAny(Collection&lt;?>, T...).
+    </action>
+    <action issue="COLLECTIONS-575" dev="ggregory" type="add" due-to="Guram Savinov, Grzegorz Rożniecki, Bruno P. Kinoshita, Gary Gregory">
+      Synchronized queue wrapper in QueueUtils.
+    </action>
+    <action issue="COLLECTIONS-670" dev="ggregory" type="add" due-to="Gary Gregory">
+      Add org.apache.commons.collections4.IteratorUtils.first(Iterator).
+    </action>
+    <action issue="COLLECTIONS-671" dev="ggregory" type="add" due-to="Gary Gregory">
+      Add org.apache.commons.collections4.IterableUtils.first(Iterable).
+    </action>
+    <action issue="COLLECTIONS-678" dev="ggregory" type="fix" due-to="Oscar Luis Vera Pérez">
+      The verification of unsupported iterator methods is not complete.
+    </action>
+    <action issue="COLLECTIONS-673" dev="ggregory" type="fix" due-to="John Mark, Stephan Fuhrmann">
+      ListUtils.partition potential integer overflow.
+    </action>
+  </release>
   <release version="4.1" date="2015-11-28" description="This is a security and minor release.">
     <action issue="COLLECTIONS-508" dev="tn" type="add">
       Added new interfaces "MultiValuedMap", "ListValuedMap" and "SetValuedMap"
@@ -131,7 +207,7 @@
     </action>
     <action issue="COLLECTIONS-542" dev="tn" type="fix">
       "AbstractHashedMap" still inherits from "AbstractMap", contrary to what
-      the class javadoc stated. The inheritance will now be removed in v5.0. 
+      the class javadoc stated. The inheritance will now be removed in v5.0.
     </action>
     <action issue="COLLECTIONS-539" dev="tn" type="add" due-to="Guram Savinov">
       Changed scope of "CircularFifoQueue#isAtFullCapacity()" to public.
@@ -232,7 +308,7 @@
       Resolved generic parameter inconsistency for various static fields, e.g. BagUtils.EMPTY_BAG,
       TruePredicate.INSTANCE and many others. All accessible static fields use raw types so that
       they can be used directly without explicit casting. To avoid compiler warnings about unchecked
-      conversion and/or rawtypes use the corresponding factory methods, e.g. BagUtils.emptyBag(). 
+      conversion and/or rawtypes use the corresponding factory methods, e.g. BagUtils.emptyBag().
     </action>
     <action issue="COLLECTIONS-501" dev="tn" type="update">
       Renamed methods "V MultiKeyMap#remove(Object, Object, ...)" to
@@ -246,7 +322,7 @@
     <action issue="COLLECTIONS-499" dev="tn" type="update">
       Refactored the test framework for Bag implementations to extend from
       "AbstractCollectionTest" by decorating the concrete Bag instance with
-      a CollectionBag or CollectionSortedBag. 
+      a CollectionBag or CollectionSortedBag.
     </action>
     <action issue="COLLECTIONS-498" dev="tn" type="fix">
       "CollectionBag" will now also respect the contract of the decorated bag in case
@@ -306,19 +382,19 @@
     <action issue="COLLECTIONS-468" dev="tn" type="add">
       Added bag decorator "CollectionBag" which decorates a bag to make it comply with the
       Collection contract.
-    </action>  
+    </action>
     <action issue="COLLECTIONS-466" dev="tn" type="update">
       Replaced "Collection" with "Iterable" for method arguments where applicable.
-    </action>  
+    </action>
     <action issue="COLLECTIONS-463" dev="tn" type="add" due-to="Andy Seaborne, Claude Warren">
       Added "PushbackIterator" decorator to support pushback of elements during iteration.
-    </action>  
+    </action>
     <action issue="COLLECTIONS-462" dev="tn" type="add" due-to="Andy Seaborne, Claude Warren">
       Added "PeekingIterator" decorator to support one-element lookahead during iteration.
     </action>
     <action issue="COLLECTIONS-461" dev="tn" type="fix" due-to="Matt Benson, sebb">
       Added additional clarification to javadoc of interface "Put" wrt return type of
-      "put(Object, Object)" method. 
+      "put(Object, Object)" method.
     </action>
     <action issue="COLLECTIONS-460" dev="tn" type="update">
       Changed "IteratorChain" to use internally a "Queue" instead of a "List". Iterators are
@@ -347,7 +423,7 @@
     <action issue="COLLECTIONS-453" dev="tn" type="update">
       Several closure and transformer implementations in the functors package
       will now copy an array as input to their constructor (e.g. ChainedClosure).
-    </action>    
+    </action>
     <action issue="COLLECTIONS-452" dev="tn" type="update">
       Change base package to org.apache.commons.collections4.
     </action>
@@ -445,7 +521,7 @@
       Improved performance of "SetUniqueList#removeAll".
     </action>
     <action issue="COLLECTIONS-407" dev="tn" type="fix" due-to="Adrian Nistor">
-      Improved performance of "ListOrderedSet#remove(Object)" in case the object is 
+      Improved performance of "ListOrderedSet#remove(Object)" in case the object is
       not contained in the Set.
     </action>
     <action issue="COLLECTIONS-406" dev="tn" type="fix" due-to="Adrian Nistor">
diff -Nru libcommons-collections4-java-4.1/src/changes/release-notes.vm libcommons-collections4-java-4.2/src/changes/release-notes.vm
--- libcommons-collections4-java-4.1/src/changes/release-notes.vm	2012-07-15 11:54:30.000000000 +0000
+++ libcommons-collections4-java-4.2/src/changes/release-notes.vm	2018-07-08 00:18:18.000000000 +0000
@@ -136,3 +136,5 @@
 patches, or suggestions for improvement, see the Apache ${project.name} website:
 
 ${project.url}
+
+Download page: ${project.url}download_pool.cgi
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/ArrayStack.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/ArrayStack.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/ArrayStack.java	2013-04-30 18:55:24.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/ArrayStack.java	2018-07-08 00:18:18.000000000 +0000
@@ -36,9 +36,9 @@
  * <b>Note:</b> From version 4.0 onwards, this class does not implement the
  * removed {@code Buffer} interface anymore.
  *
+ * @param <E> the type of elements in this list
  * @see java.util.Stack
  * @since 1.0
- * @version $Id: ArrayStack.java 1477779 2013-04-30 18:55:24Z tn $
  * @deprecated use {@link java.util.ArrayDeque} instead (available from Java 1.6)
  */
 @Deprecated
@@ -88,9 +88,8 @@
         final int n = size();
         if (n <= 0) {
             throw new EmptyStackException();
-        } else {
-            return get(n - 1);
         }
+        return get(n - 1);
     }
 
     /**
@@ -106,9 +105,8 @@
         final int m = (size() - n) - 1;
         if (m < 0) {
             throw new EmptyStackException();
-        } else {
-            return get(m);
         }
+        return get(m);
     }
 
     /**
@@ -121,9 +119,8 @@
         final int n = size();
         if (n <= 0) {
             throw new EmptyStackException();
-        } else {
-            return remove(n - 1);
         }
+        return remove(n - 1);
     }
 
     /**
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/ArrayUtils.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/ArrayUtils.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/ArrayUtils.java	1970-01-01 00:00:00.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/ArrayUtils.java	2018-07-08 00:18:18.000000000 +0000
@@ -0,0 +1,133 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.commons.collections4;
+
+/**
+ * <p>
+ * Operations on arrays, primitive arrays (like {@code int[]}) and primitive wrapper arrays (like {@code Integer[]}).
+ * </p>
+ * <p>
+ * This class tries to handle {@code null} input gracefully. An exception will not be thrown for a {@code null} array
+ * input. However, an Object array that contains a {@code null} element may throw an exception. Each method documents
+ * its behaviour.
+ * </p>
+ * <p>
+ * Package private, might move to an internal package if this needs to be public.
+ * </p>
+ * <p>
+ * #ThreadSafe#
+ * </p>
+ *
+ * @since 4.2 (Copied from Apache Commons Lang.)
+ *
+ */
+class ArrayUtils {
+
+    /**
+     * The index value when an element is not found in a list or array: {@code -1}. This value is returned by methods in
+     * this class and can also be used in comparisons with values returned by various method from
+     * {@link java.util.List}.
+     */
+    static final int INDEX_NOT_FOUND = -1;
+
+    /**
+     * <p>
+     * Checks if the object is in the given array.
+     * </p>
+     *
+     * <p>
+     * The method returns {@code false} if a {@code null} array is passed in.
+     * </p>
+     *
+     * @param array
+     *            the array to search through
+     * @param objectToFind
+     *            the object to find
+     * @return {@code true} if the array contains the object
+     */
+    static boolean contains(final Object[] array, final Object objectToFind) {
+        return indexOf(array, objectToFind) != INDEX_NOT_FOUND;
+    }
+
+    /**
+     * <p>
+     * Finds the index of the given object in the array.
+     * </p>
+     *
+     * <p>
+     * This method returns {@link #INDEX_NOT_FOUND} ({@code -1}) for a {@code null} input array.
+     * </p>
+     *
+     * @param array
+     *            the array to search through for the object, may be {@code null}
+     * @param objectToFind
+     *            the object to find, may be {@code null}
+     * @return the index of the object within the array, {@link #INDEX_NOT_FOUND} ({@code -1}) if not found or
+     *         {@code null} array input
+     */
+    static <T> int indexOf(final T[] array, final Object objectToFind) {
+        return indexOf(array, objectToFind, 0);
+    }
+
+    /**
+     * <p>
+     * Finds the index of the given object in the array starting at the given index.
+     * </p>
+     *
+     * <p>
+     * This method returns {@link #INDEX_NOT_FOUND} ({@code -1}) for a {@code null} input array.
+     * </p>
+     *
+     * <p>
+     * A negative startIndex is treated as zero. A startIndex larger than the array length will return
+     * {@link #INDEX_NOT_FOUND} ({@code -1}).
+     * </p>
+     *
+     * @param array
+     *            the array to search through for the object, may be {@code null}
+     * @param objectToFind
+     *            the object to find, may be {@code null}
+     * @param startIndex
+     *            the index to start searching at
+     * @return the index of the object within the array starting at the index, {@link #INDEX_NOT_FOUND} ({@code -1}) if
+     *         not found or {@code null} array input
+     */
+    static int indexOf(final Object[] array, final Object objectToFind, int startIndex) {
+        if (array == null) {
+            return INDEX_NOT_FOUND;
+        }
+        if (startIndex < 0) {
+            startIndex = 0;
+        }
+        if (objectToFind == null) {
+            for (int i = startIndex; i < array.length; i++) {
+                if (array[i] == null) {
+                    return i;
+                }
+            }
+        } else {
+            for (int i = startIndex; i < array.length; i++) {
+                if (objectToFind.equals(array[i])) {
+                    return i;
+                }
+            }
+        }
+        return INDEX_NOT_FOUND;
+    }
+
+}
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bag/AbstractBagDecorator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bag/AbstractBagDecorator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bag/AbstractBagDecorator.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bag/AbstractBagDecorator.java	2018-07-08 00:18:18.000000000 +0000
@@ -26,8 +26,8 @@
  * <p>
  * Methods are forwarded directly to the decorated bag.
  *
+ * @param <E> the type of elements in this bag
  * @since 3.0
- * @version $Id: AbstractBagDecorator.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public abstract class AbstractBagDecorator<E>
         extends AbstractCollectionDecorator<E> implements Bag<E> {
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bag/AbstractMapBag.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bag/AbstractMapBag.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bag/AbstractMapBag.java	2015-06-11 11:57:24.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bag/AbstractMapBag.java	2018-07-08 00:18:18.000000000 +0000
@@ -38,8 +38,8 @@
  * map will be used to map bag elements to a number; the number represents the
  * number of occurrences of that element in the bag.
  *
+ * @param <E> the type of elements in this bag
  * @since 3.0 (previously DefaultMapBag v2.0)
- * @version $Id: AbstractMapBag.java 1684859 2015-06-11 11:57:24Z tn $
  */
 public abstract class AbstractMapBag<E> implements Bag<E> {
 
@@ -141,7 +141,7 @@
         if (coll instanceof Bag) {
             return containsAll((Bag<?>) coll);
         }
-        return containsAll(new HashBag<Object>(coll));
+        return containsAll(new HashBag<>(coll));
     }
 
     /**
@@ -171,7 +171,7 @@
      */
     @Override
     public Iterator<E> iterator() {
-        return new BagIterator<E>(this);
+        return new BagIterator<>(this);
     }
 
     /**
@@ -379,7 +379,7 @@
         if (coll instanceof Bag) {
             return retainAll((Bag<?>) coll);
         }
-        return retainAll(new HashBag<Object>(coll));
+        return retainAll(new HashBag<>(coll));
     }
 
     /**
@@ -392,7 +392,7 @@
      */
     boolean retainAll(final Bag<?> other) {
         boolean result = false;
-        final Bag<E> excess = new HashBag<E>();
+        final Bag<E> excess = new HashBag<>();
         final Iterator<E> i = uniqueSet().iterator();
         while (i.hasNext()) {
             final E current = i.next();
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bag/AbstractSortedBagDecorator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bag/AbstractSortedBagDecorator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bag/AbstractSortedBagDecorator.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bag/AbstractSortedBagDecorator.java	2018-07-08 00:18:18.000000000 +0000
@@ -25,8 +25,8 @@
  * <p>
  * Methods are forwarded directly to the decorated bag.
  *
+ * @param <E> the type of elements in this bag
  * @since 3.0
- * @version $Id: AbstractSortedBagDecorator.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public abstract class AbstractSortedBagDecorator<E>
         extends AbstractBagDecorator<E> implements SortedBag<E> {
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bag/CollectionBag.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bag/CollectionBag.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bag/CollectionBag.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bag/CollectionBag.java	2018-07-08 00:18:18.000000000 +0000
@@ -34,9 +34,8 @@
  * The method javadoc highlights the differences compared to the original Bag interface.
  *
  * @see Bag
- * @param <E> the type held in the bag
+ * @param <E> the type of elements in this bag
  * @since 4.0
- * @version $Id: CollectionBag.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public final class CollectionBag<E> extends AbstractBagDecorator<E> {
 
@@ -52,7 +51,7 @@
      * @throws NullPointerException if bag is null
      */
     public static <E> Bag<E> collectionBag(final Bag<E> bag) {
-        return new CollectionBag<E>(bag);
+        return new CollectionBag<>(bag);
     }
 
     //-----------------------------------------------------------------------
@@ -71,7 +70,7 @@
      * Write the collection out using a custom routine.
      *
      * @param out  the output stream
-     * @throws IOException
+     * @throws IOException if an error occurs while writing to the stream
      */
     private void writeObject(final ObjectOutputStream out) throws IOException {
         out.defaultWriteObject();
@@ -82,8 +81,8 @@
      * Read the collection in using a custom routine.
      *
      * @param in  the input stream
-     * @throws IOException
-     * @throws ClassNotFoundException
+     * @throws IOException if an error occurs while reading from the stream
+     * @throws ClassNotFoundException if an object read from the stream can not be loaded
      * @throws ClassCastException if deserialised object has wrong type
      */
     @SuppressWarnings("unchecked") // will throw CCE, see Javadoc
@@ -178,10 +177,9 @@
                 result = result || changed;
             }
             return result;
-        } else {
-            // let the decorated bag handle the case of null argument
-            return decorated().removeAll(null);
         }
+        // let the decorated bag handle the case of null argument
+        return decorated().removeAll(null);
     }
 
     /**
@@ -213,10 +211,9 @@
                 }
             }
             return modified;
-        } else {
-            // let the decorated bag handle the case of null argument
-            return decorated().retainAll(null);
         }
+        // let the decorated bag handle the case of null argument
+        return decorated().retainAll(null);
     }
 
     //-----------------------------------------------------------------------
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bag/CollectionSortedBag.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bag/CollectionSortedBag.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bag/CollectionSortedBag.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bag/CollectionSortedBag.java	2018-07-08 00:18:18.000000000 +0000
@@ -27,8 +27,8 @@
 /**
  * Decorates another {@link SortedBag} to comply with the Collection contract.
  *
+ * @param <E> the type of elements in this bag
  * @since 4.0
- * @version $Id: CollectionSortedBag.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public final class CollectionSortedBag<E> extends AbstractSortedBagDecorator<E> {
 
@@ -44,7 +44,7 @@
      * @throws NullPointerException if bag is null
      */
     public static <E> SortedBag<E> collectionSortedBag(final SortedBag<E> bag) {
-        return new CollectionSortedBag<E>(bag);
+        return new CollectionSortedBag<>(bag);
     }
 
     //-----------------------------------------------------------------------
@@ -63,7 +63,7 @@
      * Write the collection out using a custom routine.
      *
      * @param out  the output stream
-     * @throws IOException
+     * @throws IOException if an error occurs while writing to the stream
      */
     private void writeObject(final ObjectOutputStream out) throws IOException {
         out.defaultWriteObject();
@@ -74,8 +74,8 @@
      * Read the collection in using a custom routine.
      *
      * @param in  the input stream
-     * @throws IOException
-     * @throws ClassNotFoundException
+     * @throws IOException if an error occurs while reading from the stream
+     * @throws ClassNotFoundException if an object read from the stream can not be loaded
      * @throws ClassCastException if deserialised object has wrong type
      */
     @SuppressWarnings("unchecked") // will throw CCE, see Javadoc
@@ -131,10 +131,9 @@
                 result = result || changed;
             }
             return result;
-        } else {
-            // let the decorated bag handle the case of null argument
-            return decorated().removeAll(null);
         }
+        // let the decorated bag handle the case of null argument
+        return decorated().removeAll(null);
     }
 
     @Override
@@ -149,10 +148,9 @@
                 }
             }
             return modified;
-        } else {
-            // let the decorated bag handle the case of null argument
-            return decorated().retainAll(null);
         }
+        // let the decorated bag handle the case of null argument
+        return decorated().retainAll(null);
     }
 
     //-----------------------------------------------------------------------
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bag/HashBag.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bag/HashBag.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bag/HashBag.java	2015-06-16 20:13:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bag/HashBag.java	2018-07-08 00:18:18.000000000 +0000
@@ -33,8 +33,8 @@
  * interface javadoc carefully as several methods violate the
  * {@link Collection} interface specification.
  *
+ * @param <E> the type of elements in this bag
  * @since 3.0 (previously in main package v2.0)
- * @version $Id: HashBag.java 1685902 2015-06-16 20:13:13Z tn $
  */
 public class HashBag<E> extends AbstractMapBag<E> implements Serializable {
 
@@ -61,6 +61,9 @@
     //-----------------------------------------------------------------------
     /**
      * Write the bag out using a custom routine.
+     *
+     * @param out  the output stream
+     * @throws IOException if an error occurs while writing to the stream
      */
     private void writeObject(final ObjectOutputStream out) throws IOException {
         out.defaultWriteObject();
@@ -69,6 +72,10 @@
 
     /**
      * Read the bag in using a custom routine.
+     *
+     * @param in  the input stream
+     * @throws IOException if an error occurs while reading from the stream
+     * @throws ClassNotFoundException if an object read from the stream can not be loaded
      */
     private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
         in.defaultReadObject();
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bag/package-info.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bag/package-info.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bag/package-info.java	2013-11-11 18:58:31.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bag/package-info.java	2018-07-08 00:18:18.000000000 +0000
@@ -34,6 +34,5 @@
  *   <li>Collection - ensures compliance with the java.util.Collection contract
  * </ul>
  *
- * @version $Id: package-info.java 1540804 2013-11-11 18:58:31Z tn $
  */
 package org.apache.commons.collections4.bag;
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bag/PredicatedBag.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bag/PredicatedBag.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bag/PredicatedBag.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bag/PredicatedBag.java	2018-07-08 00:18:18.000000000 +0000
@@ -37,8 +37,8 @@
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  *
+ * @param <E> the type of elements in this bag
  * @since 3.0
- * @version $Id: PredicatedBag.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class PredicatedBag<E> extends PredicatedCollection<E> implements Bag<E> {
 
@@ -60,7 +60,7 @@
      * @since 4.0
      */
     public static <E> PredicatedBag<E> predicatedBag(final Bag<E> bag, final Predicate<? super E> predicate) {
-        return new PredicatedBag<E>(bag, predicate);
+        return new PredicatedBag<>(bag, predicate);
     }
 
     //-----------------------------------------------------------------------
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bag/PredicatedSortedBag.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bag/PredicatedSortedBag.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bag/PredicatedSortedBag.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bag/PredicatedSortedBag.java	2018-07-08 00:18:18.000000000 +0000
@@ -36,8 +36,8 @@
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  *
+ * @param <E> the type of elements in this bag
  * @since 3.0
- * @version $Id: PredicatedSortedBag.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class PredicatedSortedBag<E> extends PredicatedBag<E> implements SortedBag<E> {
 
@@ -60,7 +60,7 @@
      */
     public static <E> PredicatedSortedBag<E> predicatedSortedBag(final SortedBag<E> bag,
                                                                  final Predicate<? super E> predicate) {
-        return new PredicatedSortedBag<E>(bag, predicate);
+        return new PredicatedSortedBag<>(bag, predicate);
     }
 
     //-----------------------------------------------------------------------
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bag/SynchronizedBag.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bag/SynchronizedBag.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bag/SynchronizedBag.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bag/SynchronizedBag.java	2018-07-08 00:18:18.000000000 +0000
@@ -30,8 +30,8 @@
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  *
+ * @param <E> the type of elements in this bag
  * @since 3.0
- * @version $Id: SynchronizedBag.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class SynchronizedBag<E> extends SynchronizedCollection<E> implements Bag<E> {
 
@@ -48,7 +48,7 @@
      * @since 4.0
      */
     public static <E> SynchronizedBag<E> synchronizedBag(final Bag<E> bag) {
-        return new SynchronizedBag<E>(bag);
+        return new SynchronizedBag<>(bag);
     }
 
     //-----------------------------------------------------------------------
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bag/SynchronizedSortedBag.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bag/SynchronizedSortedBag.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bag/SynchronizedSortedBag.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bag/SynchronizedSortedBag.java	2018-07-08 00:18:18.000000000 +0000
@@ -30,8 +30,8 @@
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  *
+ * @param <E> the type of elements in this bag
  * @since 3.0
- * @version $Id: SynchronizedSortedBag.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class SynchronizedSortedBag<E> extends SynchronizedBag<E> implements SortedBag<E> {
 
@@ -48,7 +48,7 @@
      * @since 4.0
      */
     public static <E> SynchronizedSortedBag<E> synchronizedSortedBag(final SortedBag<E> bag) {
-        return new SynchronizedSortedBag<E>(bag);
+        return new SynchronizedSortedBag<>(bag);
     }
 
     //-----------------------------------------------------------------------
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bag/TransformedBag.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bag/TransformedBag.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bag/TransformedBag.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bag/TransformedBag.java	2018-07-08 00:18:18.000000000 +0000
@@ -33,8 +33,8 @@
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  *
+ * @param <E> the type of elements in this bag
  * @since 3.0
- * @version $Id: TransformedBag.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class TransformedBag<E> extends TransformedCollection<E> implements Bag<E> {
 
@@ -55,7 +55,7 @@
      * @since 4.0
      */
     public static <E> Bag<E> transformingBag(final Bag<E> bag, final Transformer<? super E, ? extends E> transformer) {
-        return new TransformedBag<E>(bag, transformer);
+        return new TransformedBag<>(bag, transformer);
     }
 
     /**
@@ -74,7 +74,7 @@
      * @since 4.0
      */
     public static <E> Bag<E> transformedBag(final Bag<E> bag, final Transformer<? super E, ? extends E> transformer) {
-        final TransformedBag<E> decorated = new TransformedBag<E>(bag, transformer);
+        final TransformedBag<E> decorated = new TransformedBag<>(bag, transformer);
         if (bag.size() > 0) {
             @SuppressWarnings("unchecked") // Bag is of type E
             final E[] values = (E[]) bag.toArray(); // NOPMD - false positive for generics
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bag/TransformedSortedBag.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bag/TransformedSortedBag.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bag/TransformedSortedBag.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bag/TransformedSortedBag.java	2018-07-08 00:18:18.000000000 +0000
@@ -31,8 +31,8 @@
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  *
+ * @param <E> the type of elements in this bag
  * @since 3.0
- * @version $Id: TransformedSortedBag.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class TransformedSortedBag<E> extends TransformedBag<E> implements SortedBag<E> {
 
@@ -54,7 +54,7 @@
      */
     public static <E> TransformedSortedBag<E> transformingSortedBag(final SortedBag<E> bag,
             final Transformer<? super E, ? extends E> transformer) {
-        return new TransformedSortedBag<E>(bag, transformer);
+        return new TransformedSortedBag<>(bag, transformer);
     }
 
     /**
@@ -75,7 +75,7 @@
     public static <E> TransformedSortedBag<E> transformedSortedBag(final SortedBag<E> bag,
             final Transformer<? super E, ? extends E> transformer) {
 
-        final TransformedSortedBag<E>  decorated = new TransformedSortedBag<E>(bag, transformer);
+        final TransformedSortedBag<E>  decorated = new TransformedSortedBag<>(bag, transformer);
         if (bag.size() > 0) {
             @SuppressWarnings("unchecked") // bag is type E
             final E[] values = (E[]) bag.toArray(); // NOPMD - false positive for generics
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bag/TreeBag.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bag/TreeBag.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bag/TreeBag.java	2015-06-06 20:19:03.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bag/TreeBag.java	2018-07-08 00:18:18.000000000 +0000
@@ -38,8 +38,8 @@
  * copies of an object to be added or removed at once. It is important to read the interface
  * javadoc carefully as several methods violate the {@link Collection} interface specification.
  *
+ * @param <E> the type of elements in this bag
  * @since 3.0 (previously in main package v2.0)
- * @version $Id: TreeBag.java 1683951 2015-06-06 20:19:03Z tn $
  */
 public class TreeBag<E> extends AbstractMapBag<E> implements SortedBag<E>, Serializable {
 
@@ -120,6 +120,9 @@
     //-----------------------------------------------------------------------
     /**
      * Write the bag out using a custom routine.
+     *
+     * @param out  the output stream
+     * @throws IOException if an error occurs while writing to the stream
      */
     private void writeObject(final ObjectOutputStream out) throws IOException {
         out.defaultWriteObject();
@@ -129,6 +132,10 @@
 
     /**
      * Read the bag in using a custom routine.
+     *
+     * @param in  the input stream
+     * @throws IOException if an error occurs while reading from the stream
+     * @throws ClassNotFoundException if an object read from the stream can not be loaded
      */
     private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
         in.defaultReadObject();
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bag/UnmodifiableBag.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bag/UnmodifiableBag.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bag/UnmodifiableBag.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bag/UnmodifiableBag.java	2018-07-08 00:18:18.000000000 +0000
@@ -35,8 +35,8 @@
  * <p>
  * Attempts to modify it will result in an UnsupportedOperationException.
  *
+ * @param <E> the type of elements in this bag
  * @since 3.0
- * @version $Id: UnmodifiableBag.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public final class UnmodifiableBag<E>
         extends AbstractBagDecorator<E> implements Unmodifiable {
@@ -61,7 +61,7 @@
             final Bag<E> tmpBag = (Bag<E>) bag;
             return tmpBag;
         }
-        return new UnmodifiableBag<E>(bag);
+        return new UnmodifiableBag<>(bag);
     }
 
     //-----------------------------------------------------------------------
@@ -81,7 +81,7 @@
      * Write the collection out using a custom routine.
      *
      * @param out  the output stream
-     * @throws IOException
+     * @throws IOException if an error occurs while writing to the stream
      */
     private void writeObject(final ObjectOutputStream out) throws IOException {
         out.defaultWriteObject();
@@ -92,8 +92,8 @@
      * Read the collection in using a custom routine.
      *
      * @param in  the input stream
-     * @throws IOException
-     * @throws ClassNotFoundException
+     * @throws IOException if an error occurs while reading from the stream
+     * @throws ClassNotFoundException if an object read from the stream can not be loaded
      * @throws ClassCastException if deserialised object has wrong type
      */
     @SuppressWarnings("unchecked") // will throw CCE, see Javadoc
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bag/UnmodifiableSortedBag.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bag/UnmodifiableSortedBag.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bag/UnmodifiableSortedBag.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bag/UnmodifiableSortedBag.java	2018-07-08 00:18:18.000000000 +0000
@@ -35,8 +35,8 @@
  * <p>
  * Attempts to modify it will result in an UnsupportedOperationException.
  *
+ * @param <E> the type of elements in this bag
  * @since 3.0
- * @version $Id: UnmodifiableSortedBag.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public final class UnmodifiableSortedBag<E>
         extends AbstractSortedBagDecorator<E> implements Unmodifiable {
@@ -59,7 +59,7 @@
         if (bag instanceof Unmodifiable) {
             return bag;
         }
-        return new UnmodifiableSortedBag<E>(bag);
+        return new UnmodifiableSortedBag<>(bag);
     }
 
     //-----------------------------------------------------------------------
@@ -78,7 +78,7 @@
      * Write the collection out using a custom routine.
      *
      * @param out  the output stream
-     * @throws IOException
+     * @throws IOException if an error occurs while writing to the stream
      */
     private void writeObject(final ObjectOutputStream out) throws IOException {
         out.defaultWriteObject();
@@ -89,8 +89,8 @@
      * Read the collection in using a custom routine.
      *
      * @param in  the input stream
-     * @throws IOException
-     * @throws ClassNotFoundException
+     * @throws IOException if an error occurs while reading from the stream
+     * @throws ClassNotFoundException if an object read from the stream can not be loaded
      * @throws ClassCastException if deserialised object has wrong type
      */
     @SuppressWarnings("unchecked") // will throw CCE, see Javadoc
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/Bag.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/Bag.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/Bag.java	2013-04-30 18:55:24.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/Bag.java	2018-07-08 00:18:18.000000000 +0000
@@ -38,9 +38,8 @@
  * In an ideal world, the interface would be changed to fix the problems, however
  * it has been decided to maintain backwards compatibility instead.
  *
- * @param <E> the type held in the bag
+ * @param <E> the type of elements in this bag
  * @since 2.0
- * @version $Id: Bag.java 1477779 2013-04-30 18:55:24Z tn $
  */
 public interface Bag<E> extends Collection<E> {
 
@@ -70,6 +69,7 @@
      * @param object  the object to add
      * @return <code>true</code> if the object was not already in the <code>uniqueSet</code>
      */
+    @Override
     boolean add(E object);
 
     /**
@@ -98,6 +98,7 @@
      * @param object  the object to remove
      * @return <code>true</code> if this call changed the collection
      */
+    @Override
     boolean remove(Object object);
 
     /**
@@ -126,6 +127,7 @@
      *
      * @return the total size of the Bag
      */
+    @Override
     int size();
 
     /**
@@ -144,6 +146,7 @@
      * @param coll  the collection to check against
      * @return <code>true</code> if the Bag contains all the collection
      */
+    @Override
     boolean containsAll(Collection<?> coll);
 
     /**
@@ -162,6 +165,7 @@
      * @param coll  the collection to remove
      * @return <code>true</code> if this call changed the collection
      */
+    @Override
     boolean removeAll(Collection<?> coll);
 
     /**
@@ -183,6 +187,7 @@
      * @param coll  the collection to retain
      * @return <code>true</code> if this call changed the collection
      */
+    @Override
     boolean retainAll(Collection<?> coll);
 
     /**
@@ -192,6 +197,7 @@
      *
      * @return iterator over all elements in the Bag
      */
+    @Override
     Iterator<E> iterator();
 
     // The following is not part of the formal Bag interface, however where possible
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/BagUtils.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/BagUtils.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/BagUtils.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/BagUtils.java	2018-07-08 00:18:18.000000000 +0000
@@ -32,7 +32,6 @@
  * Provides utility methods and decorators for {@link Bag} and {@link SortedBag} instances.
  *
  * @since 2.1
- * @version $Id: BagUtils.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class BagUtils {
 
@@ -40,14 +39,14 @@
      * An empty unmodifiable bag.
      */
     @SuppressWarnings("rawtypes") // OK, empty bag is compatible with any type
-    public static final Bag EMPTY_BAG = UnmodifiableBag.unmodifiableBag(new HashBag<Object>());
+    public static final Bag EMPTY_BAG = UnmodifiableBag.unmodifiableBag(new HashBag<>());
 
     /**
      * An empty unmodifiable sorted bag.
      */
     @SuppressWarnings("rawtypes") // OK, empty bag is compatible with any type
     public static final Bag EMPTY_SORTED_BAG =
-            UnmodifiableSortedBag.unmodifiableSortedBag(new TreeBag<Object>());
+            UnmodifiableSortedBag.unmodifiableSortedBag(new TreeBag<>());
 
     /**
      * Instantiation of BagUtils is not intended or required.
@@ -246,7 +245,7 @@
      */
     @SuppressWarnings("unchecked") // OK, empty bag is compatible with any type
     public static <E> Bag<E> emptyBag() {
-        return (Bag<E>) EMPTY_BAG;
+        return EMPTY_BAG;
     }
 
     /**
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bidimap/AbstractBidiMapDecorator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bidimap/AbstractBidiMapDecorator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bidimap/AbstractBidiMapDecorator.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bidimap/AbstractBidiMapDecorator.java	2018-07-08 00:18:18.000000000 +0000
@@ -34,8 +34,9 @@
  * it would provide a loophole around the validation.
  * But, you might want that loophole, so this class is kept simple.
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  * @since 3.0
- * @version $Id: AbstractBidiMapDecorator.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public abstract class AbstractBidiMapDecorator<K, V>
         extends AbstractMapDecorator<K, V> implements BidiMap<K, V> {
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java	2015-06-06 20:19:03.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bidimap/AbstractDualBidiMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -34,10 +34,12 @@
  * An implementation can be written simply by implementing the
  * {@link #createBidiMap(Map, Map, BidiMap)} method.
  *
+ * @param <K> the type of the keys in the map
+ * @param <V> the type of the values in the map
+ *
  * @see DualHashBidiMap
  * @see DualTreeBidiMap
  * @since 3.0
- * @version $Id: AbstractDualBidiMap.java 1683951 2015-06-06 20:19:03Z tn $
  */
 public abstract class AbstractDualBidiMap<K, V> implements BidiMap<K, V> {
 
@@ -225,7 +227,7 @@
      */
     @Override
     public MapIterator<K, V> mapIterator() {
-        return new BidiMapIterator<K, V>(this);
+        return new BidiMapIterator<>(this);
     }
 
     @Override
@@ -263,7 +265,7 @@
     @Override
     public Set<K> keySet() {
         if (keySet == null) {
-            keySet = new KeySet<K>(this);
+            keySet = new KeySet<>(this);
         }
         return keySet;
     }
@@ -276,7 +278,7 @@
      * @return the keySet iterator
      */
     protected Iterator<K> createKeySetIterator(final Iterator<K> iterator) {
-        return new KeySetIterator<K>(iterator, this);
+        return new KeySetIterator<>(iterator, this);
     }
 
     /**
@@ -289,7 +291,7 @@
     @Override
     public Set<V> values() {
         if (values == null) {
-            values = new Values<V>(this);
+            values = new Values<>(this);
         }
         return values;
     }
@@ -302,7 +304,7 @@
      * @return the values iterator
      */
     protected Iterator<V> createValuesIterator(final Iterator<V> iterator) {
-        return new ValuesIterator<V>(iterator, this);
+        return new ValuesIterator<>(iterator, this);
     }
 
     /**
@@ -319,7 +321,7 @@
     @Override
     public Set<Map.Entry<K, V>> entrySet() {
         if (entrySet == null) {
-            entrySet = new EntrySet<K, V>(this);
+            entrySet = new EntrySet<>(this);
         }
         return entrySet;
     }
@@ -332,7 +334,7 @@
      * @return the entrySet iterator
      */
     protected Iterator<Map.Entry<K, V>> createEntrySetIterator(final Iterator<Map.Entry<K, V>> iterator) {
-        return new EntrySetIterator<K, V>(iterator, this);
+        return new EntrySetIterator<>(iterator, this);
     }
 
     //-----------------------------------------------------------------------
@@ -652,7 +654,7 @@
 
         @Override
         public Map.Entry<K, V> next() {
-            last = new MapEntry<K, V>(super.next(), parent);
+            last = new MapEntry<>(super.next(), parent);
             canRemove = true;
             return last;
         }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecorator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecorator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecorator.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecorator.java	2018-07-08 00:18:18.000000000 +0000
@@ -31,8 +31,9 @@
  * it would provide a loophole around the validation.
  * But, you might want that loophole, so this class is kept simple.
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  * @since 3.0
- * @version $Id: AbstractOrderedBidiMapDecorator.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public abstract class AbstractOrderedBidiMapDecorator<K, V>
         extends AbstractBidiMapDecorator<K, V>
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapDecorator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapDecorator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapDecorator.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapDecorator.java	2018-07-08 00:18:18.000000000 +0000
@@ -33,8 +33,9 @@
  * it would provide a loophole around the validation.
  * But, you might want that loophole, so this class is kept simple.
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  * @since 3.0
- * @version $Id: AbstractSortedBidiMapDecorator.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public abstract class AbstractSortedBidiMapDecorator<K, V>
         extends AbstractOrderedBidiMapDecorator<K, V> implements SortedBidiMap<K, V> {
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bidimap/DualHashBidiMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bidimap/DualHashBidiMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bidimap/DualHashBidiMap.java	2013-10-20 21:12:51.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bidimap/DualHashBidiMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -36,8 +36,10 @@
  * NOTE: From Commons Collections 3.1, all subclasses will use {@link HashMap}
  * and the flawed <code>createMap</code> method is ignored.
  *
+ * @param <K> the type of the keys in the map
+ * @param <V> the type of the values in the map
+ *
  * @since 3.0
- * @version $Id: DualHashBidiMap.java 1533984 2013-10-20 21:12:51Z tn $
  */
 public class DualHashBidiMap<K, V> extends AbstractDualBidiMap<K, V> implements Serializable {
 
@@ -85,7 +87,7 @@
     @Override
     protected BidiMap<V, K> createBidiMap(final Map<V, K> normalMap, final Map<K, V> reverseMap,
                                           final BidiMap<K, V> inverseBidiMap) {
-        return new DualHashBidiMap<V, K>(normalMap, reverseMap, inverseBidiMap);
+        return new DualHashBidiMap<>(normalMap, reverseMap, inverseBidiMap);
     }
 
     // Serialization
@@ -97,8 +99,8 @@
 
     private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
         in.defaultReadObject();
-        normalMap = new HashMap<K, V>();
-        reverseMap = new HashMap<V, K>();
+        normalMap = new HashMap<>();
+        reverseMap = new HashMap<>();
         @SuppressWarnings("unchecked") // will fail at runtime if stream is incorrect
         final Map<K, V> map = (Map<K, V>) in.readObject();
         putAll(map);
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMap.java	2013-10-20 21:12:51.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -31,7 +31,9 @@
  * Two <code>LinkedHashMap</code> instances are used in this class.
  * This provides fast lookups at the expense of storing two sets of map entries and two linked lists.
  *
- * @version $Id: DualLinkedHashBidiMap.java 1533984 2013-10-20 21:12:51Z tn $
+ * @param <K> the type of the keys in the map
+ * @param <V> the type of the values in the map
+ *
  * @since 4.0
  */
 public class DualLinkedHashBidiMap<K, V> extends AbstractDualBidiMap<K, V> implements Serializable {
@@ -80,7 +82,7 @@
     @Override
     protected BidiMap<V, K> createBidiMap(final Map<V, K> normalMap, final Map<K, V> reverseMap,
             final BidiMap<K, V> inverseBidiMap) {
-        return new DualLinkedHashBidiMap<V, K>(normalMap, reverseMap, inverseBidiMap);
+        return new DualLinkedHashBidiMap<>(normalMap, reverseMap, inverseBidiMap);
     }
 
     // Serialization
@@ -92,8 +94,8 @@
 
     private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
         in.defaultReadObject();
-        normalMap = new LinkedHashMap<K, V>();
-        reverseMap = new LinkedHashMap<V, K>();
+        normalMap = new LinkedHashMap<>();
+        reverseMap = new LinkedHashMap<>();
         @SuppressWarnings("unchecked") // will fail at runtime if stream is incorrect
         final Map<K, V> map = (Map<K, V>) in.readObject();
         putAll(map);
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java	2015-06-06 20:19:03.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -49,8 +49,9 @@
  * NOTE: From Commons Collections 3.1, all subclasses will use {@link TreeMap}
  * and the flawed <code>createMap</code> method is ignored.
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  * @since 3.0
- * @version $Id: DualTreeBidiMap.java 1683951 2015-06-06 20:19:03Z tn $
  */
 public class DualTreeBidiMap<K, V> extends AbstractDualBidiMap<K, V>
         implements SortedBidiMap<K, V>, Serializable {
@@ -123,7 +124,7 @@
     @Override
     protected DualTreeBidiMap<V, K> createBidiMap(final Map<V, K> normalMap, final Map<K, V> reverseMap,
                                                   final BidiMap<K, V> inverseMap) {
-        return new DualTreeBidiMap<V, K>(normalMap, reverseMap, inverseMap);
+        return new DualTreeBidiMap<>(normalMap, reverseMap, inverseMap);
     }
 
     //-----------------------------------------------------------------------
@@ -192,7 +193,7 @@
      */
     @Override
     public OrderedMapIterator<K, V> mapIterator() {
-        return new BidiOrderedMapIterator<K, V>(this);
+        return new BidiOrderedMapIterator<>(this);
     }
 
     public SortedBidiMap<V, K> inverseSortedBidiMap() {
@@ -208,19 +209,19 @@
     @Override
     public SortedMap<K, V> headMap(final K toKey) {
         final SortedMap<K, V> sub = ((SortedMap<K, V>) normalMap).headMap(toKey);
-        return new ViewMap<K, V>(this, sub);
+        return new ViewMap<>(this, sub);
     }
 
     @Override
     public SortedMap<K, V> tailMap(final K fromKey) {
         final SortedMap<K, V> sub = ((SortedMap<K, V>) normalMap).tailMap(fromKey);
-        return new ViewMap<K, V>(this, sub);
+        return new ViewMap<>(this, sub);
     }
 
     @Override
     public SortedMap<K, V> subMap(final K fromKey, final K toKey) {
         final SortedMap<K, V> sub = ((SortedMap<K, V>) normalMap).subMap(fromKey, toKey);
-        return new ViewMap<K, V>(this, sub);
+        return new ViewMap<>(this, sub);
     }
 
     @Override
@@ -242,7 +243,7 @@
             // the implementation is not great here...
             // use the normalMap as the filtered map, but reverseMap as the full map
             // this forces containsValue and clear to be overridden
-            super(new DualTreeBidiMap<K, V>(sm, bidi.reverseMap, bidi.inverseBidiMap));
+            super(new DualTreeBidiMap<>(sm, bidi.reverseMap, bidi.inverseBidiMap));
         }
 
         @Override
@@ -262,17 +263,17 @@
 
         @Override
         public SortedMap<K, V> headMap(final K toKey) {
-            return new ViewMap<K, V>(decorated(), super.headMap(toKey));
+            return new ViewMap<>(decorated(), super.headMap(toKey));
         }
 
         @Override
         public SortedMap<K, V> tailMap(final K fromKey) {
-            return new ViewMap<K, V>(decorated(), super.tailMap(fromKey));
+            return new ViewMap<>(decorated(), super.tailMap(fromKey));
         }
 
         @Override
         public SortedMap<K, V> subMap(final K fromKey, final K toKey) {
-            return new ViewMap<K, V>(decorated(), super.subMap(fromKey, toKey));
+            return new ViewMap<>(decorated(), super.subMap(fromKey, toKey));
         }
 
         @Override
@@ -313,7 +314,7 @@
         protected BidiOrderedMapIterator(final AbstractDualBidiMap<K, V> parent) {
             super();
             this.parent = parent;
-            iterator = new ArrayList<Map.Entry<K, V>>(parent.entrySet()).listIterator();
+            iterator = new ArrayList<>(parent.entrySet()).listIterator();
         }
 
         @Override
@@ -384,7 +385,7 @@
 
         @Override
         public void reset() {
-            iterator = new ArrayList<Map.Entry<K, V>>(parent.entrySet()).listIterator();
+            iterator = new ArrayList<>(parent.entrySet()).listIterator();
             last = null;
         }
 
@@ -406,8 +407,8 @@
 
     private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
         in.defaultReadObject();
-        normalMap = new TreeMap<K, V>(comparator);
-        reverseMap = new TreeMap<V, K>(valueComparator);
+        normalMap = new TreeMap<>(comparator);
+        reverseMap = new TreeMap<>(valueComparator);
         @SuppressWarnings("unchecked") // will fail at runtime if the stream is incorrect
         final Map<K, V> map = (Map<K, V>) in.readObject();
         putAll(map);
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bidimap/package-info.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bidimap/package-info.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bidimap/package-info.java	2013-04-30 18:08:32.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bidimap/package-info.java	2018-07-08 00:18:18.000000000 +0000
@@ -36,6 +36,5 @@
  *   <li>Unmodifiable - ensures the map cannot be altered
  * </ul>
  *
- * @version $Id: package-info.java 1477745 2013-04-30 18:08:32Z tn $
  */
 package org.apache.commons.collections4.bidimap;
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java	2015-06-06 20:19:03.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bidimap/TreeBidiMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -72,13 +72,15 @@
  * not allow setValue() and will throw an
  * UnsupportedOperationException on attempts to call that method.
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
+ *
  * @since 3.0 (previously DoubleOrderedMap v2.0)
- * @version $Id: TreeBidiMap.java 1683951 2015-06-06 20:19:03Z tn $
  */
 public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>>
     implements OrderedBidiMap<K, V>, Serializable {
 
-    static enum DataElement {
+    enum DataElement {
         KEY("key"), VALUE("value");
 
         private final String description;
@@ -509,7 +511,7 @@
         Node<K, V> node = rootNode[KEY.ordinal()];
         if (node == null) {
             // map is empty
-            final Node<K, V> root = new Node<K, V>(key, value);
+            final Node<K, V> root = new Node<>(key, value);
             rootNode[KEY.ordinal()] = root;
             rootNode[VALUE.ordinal()] = root;
             grow();
@@ -526,7 +528,7 @@
                     if (node.getLeft(KEY) != null) {
                         node = node.getLeft(KEY);
                     } else {
-                        final Node<K, V> newNode = new Node<K, V>(key, value);
+                        final Node<K, V> newNode = new Node<>(key, value);
 
                         insertValue(newNode);
                         node.setLeft(newNode, KEY);
@@ -540,7 +542,7 @@
                     if (node.getRight(KEY) != null) {
                         node = node.getRight(KEY);
                     } else {
-                        final Node<K, V> newNode = new Node<K, V>(key, value);
+                        final Node<K, V> newNode = new Node<>(key, value);
 
                         insertValue(newNode);
                         node.setRight(newNode, KEY);
@@ -577,7 +579,8 @@
      * do the actual lookup of a piece of data
      *
      * @param data the key or value to be looked up
-     * @param index  the KEY or VALUE int
+     * @param dataElement  either {@link DataElement#KEY} key}
+     *                     or the {@link DataElement#VALUE value}.
      * @return the desired Node, or null if there is no mapping of the
      *         specified data
      */
@@ -591,9 +594,8 @@
             if (cmp == 0) {
                 rval = node;
                 break;
-            } else {
-                node = cmp < 0 ? node.getLeft(dataElement) : node.getRight(dataElement);
             }
+            node = cmp < 0 ? node.getLeft(dataElement) : node.getRight(dataElement);
         }
 
         return rval;
@@ -611,7 +613,8 @@
      * get the next larger node from the specified node
      *
      * @param node the node to be searched from
-     * @param index  the KEY or VALUE int
+     * @param dataElement  either {@link DataElement#KEY} key}
+     *                     or the {@link DataElement#VALUE value}.
      * @return the specified node
      */
     private Node<K, V> nextGreater(final Node<K, V> node, final DataElement dataElement) {
@@ -645,7 +648,8 @@
      * get the next larger node from the specified node
      *
      * @param node the node to be searched from
-     * @param index  the KEY or VALUE int
+     * @param dataElement  either {@link DataElement#KEY} key}
+     *                     or the {@link DataElement#VALUE value}.
      * @return the specified node
      */
     private Node<K, V> nextSmaller(final Node<K, V> node, final DataElement dataElement) {
@@ -694,7 +698,8 @@
      * Find the least node from a given node.
      *
      * @param node  the node from which we will start searching
-     * @param index  the KEY or VALUE int
+     * @param dataElement  either {@link DataElement#KEY} key}
+     *                     or the {@link DataElement#VALUE value}.
      * @return the smallest node, from the specified node, in the
      *         specified mapping
      */
@@ -712,7 +717,8 @@
      * Find the greatest node from a given node.
      *
      * @param node  the node from which we will start searching
-     * @param index  the KEY or VALUE int
+     * @param dataElement  either {@link DataElement#KEY} key}
+     *                     or the {@link DataElement#VALUE value}.
      * @return the greatest node, from the specified node
      */
     private Node<K, V> greatestNode(final Node<K, V> node, final DataElement dataElement) {
@@ -731,7 +737,8 @@
      *
      * @param from the node whose color we're copying; may be null
      * @param to the node whose color we're changing; may be null
-     * @param index  the KEY or VALUE int
+     * @param dataElement  either {@link DataElement#KEY} key}
+     *                     or the {@link DataElement#VALUE value}.
      */
     private void copyColor(final Node<K, V> from, final Node<K, V> to, final DataElement dataElement) {
         if (to != null) {
@@ -749,7 +756,8 @@
      * black, thank you
      *
      * @param node the node (may be null) in question
-     * @param index  the KEY or VALUE int
+     * @param dataElement  either {@link DataElement#KEY} key}
+     *                     or the {@link DataElement#VALUE value}.
      */
     private static boolean isRed(final Node<?, ?> node, final DataElement dataElement) {
         return node != null && node.isRed(dataElement);
@@ -760,7 +768,8 @@
      * it's black, thank you
      *
      * @param node the node (may be null) in question
-     * @param index  the KEY or VALUE int
+     * @param dataElement  either {@link DataElement#KEY} key}
+     *                     or the {@link DataElement#VALUE value}.
      */
     private static boolean isBlack(final Node<?, ?> node, final DataElement dataElement) {
         return node == null || node.isBlack(dataElement);
@@ -770,7 +779,8 @@
      * force a node (if it exists) red
      *
      * @param node the node (may be null) in question
-     * @param index  the KEY or VALUE int
+     * @param dataElement  either {@link DataElement#KEY} key}
+     *                     or the {@link DataElement#VALUE value}.
      */
     private static void makeRed(final Node<?, ?> node, final DataElement dataElement) {
         if (node != null) {
@@ -782,7 +792,8 @@
      * force a node (if it exists) black
      *
      * @param node the node (may be null) in question
-     * @param index  the KEY or VALUE int
+     * @param dataElement  either {@link DataElement#KEY} key}
+     *                     or the {@link DataElement#VALUE value}.
      */
     private static void makeBlack(final Node<?, ?> node, final DataElement dataElement) {
         if (node != null) {
@@ -795,7 +806,8 @@
      * its grandparent may not exist. no problem
      *
      * @param node the node (may be null) in question
-     * @param index  the KEY or VALUE int
+     * @param dataElement  either {@link DataElement#KEY} key}
+     *                     or the {@link DataElement#VALUE value}.
      */
     private Node<K, V> getGrandParent(final Node<K, V> node, final DataElement dataElement) {
         return getParent(getParent(node, dataElement), dataElement);
@@ -806,7 +818,8 @@
      * exist. no problem
      *
      * @param node the node (may be null) in question
-     * @param index  the KEY or VALUE int
+     * @param dataElement  either {@link DataElement#KEY} key}
+     *                     or the {@link DataElement#VALUE value}.
      */
     private Node<K, V> getParent(final Node<K, V> node, final DataElement dataElement) {
         return node == null ? null : node.getParent(dataElement);
@@ -817,7 +830,8 @@
      * problem
      *
      * @param node the node (may be null) in question
-     * @param index  the KEY or VALUE int
+     * @param dataElement  either {@link DataElement#KEY} key}
+     *                     or the {@link DataElement#VALUE value}.
      */
     private Node<K, V> getRightChild(final Node<K, V> node, final DataElement dataElement) {
         return node == null ? null : node.getRight(dataElement);
@@ -828,7 +842,8 @@
      * problem
      *
      * @param node the node (may be null) in question
-     * @param index  the KEY or VALUE int
+     * @param dataElement  either {@link DataElement#KEY} key}
+     *                     or the {@link DataElement#VALUE value}.
      */
     private Node<K, V> getLeftChild(final Node<K, V> node, final DataElement dataElement) {
         return node == null ? null : node.getLeft(dataElement);
@@ -838,7 +853,8 @@
      * do a rotate left. standard fare in the world of balanced trees
      *
      * @param node the node to be rotated
-     * @param index  the KEY or VALUE int
+     * @param dataElement  either {@link DataElement#KEY} key}
+     *                     or the {@link DataElement#VALUE value}.
      */
     private void rotateLeft(final Node<K, V> node, final DataElement dataElement) {
         final Node<K, V> rightChild = node.getRight(dataElement);
@@ -866,7 +882,8 @@
      * do a rotate right. standard fare in the world of balanced trees
      *
      * @param node the node to be rotated
-     * @param index  the KEY or VALUE int
+     * @param dataElement  either {@link DataElement#KEY} key}
+     *                     or the {@link DataElement#VALUE value}.
      */
     private void rotateRight(final Node<K, V> node, final DataElement dataElement) {
         final Node<K, V> leftChild = node.getLeft(dataElement);
@@ -1211,8 +1228,8 @@
      * Comparable and non-null
      *
      * @param o the object being checked
-     * @param index  the KEY or VALUE int (used to put the right word in the
-     *              exception message)
+     * @param dataElement  either {@link DataElement#KEY} key}
+     *                     or the {@link DataElement#VALUE value}.
      *
      * @throws NullPointerException if o is null
      * @throws ClassCastException if o is not Comparable
@@ -1336,7 +1353,8 @@
      * Compares for equals as per the API.
      *
      * @param obj  the object to compare to
-     * @param type  the KEY or VALUE int
+     * @param dataElement  either {@link DataElement#KEY} key}
+     *                     or the {@link DataElement#VALUE value}.
      * @return true if equal
      */
     private boolean doEquals(final Object obj, final DataElement dataElement) {
@@ -1372,7 +1390,8 @@
     /**
      * Gets the hash code value for this map as per the API.
      *
-     * @param type  the KEY or VALUE int
+     * @param dataElement  either {@link DataElement#KEY} key}
+     *                     or the {@link DataElement#VALUE value}.
      * @return the hash code value for this map
      */
     private int doHashCode(final DataElement dataElement) {
@@ -1390,7 +1409,8 @@
     /**
      * Gets the string form of this map as per AbstractMap.
      *
-     * @param type  the KEY or VALUE int
+     * @param dataElement  either {@link DataElement#KEY} key}
+     *                     or the {@link DataElement#VALUE value}.
      * @return the string form of this map
      */
     private String doToString(final DataElement dataElement) {
@@ -1431,21 +1451,28 @@
 
     /**
      * Reads the content of the stream.
+     *
+     * @param stream the input stream
+     * @throws IOException if an error occurs while reading from the stream
+     * @throws ClassNotFoundException if an object read from the stream can not be loaded
      */
     @SuppressWarnings("unchecked") // This will fail at runtime if the stream is incorrect
     private void readObject(final ObjectInputStream stream) throws IOException, ClassNotFoundException{
         stream.defaultReadObject();
         rootNode = new Node[2];
-        int size = stream.readInt();
+        final int size = stream.readInt();
         for(int i = 0; i < size; i++){
-            K k =(K) stream.readObject();
-            V v =(V) stream.readObject();
+            final K k =(K) stream.readObject();
+            final V v =(V) stream.readObject();
             put(k, v);
         }
     }
 
     /**
      * Writes the content to the stream for serialization.
+     *
+     * @param stream  the output stream
+     * @throws IOException if an error occurs while writing to the stream
      */
     private void writeObject(final ObjectOutputStream stream) throws IOException{
         stream.defaultWriteObject();
@@ -1468,7 +1495,6 @@
         /**
          * Constructor.
          * @param orderType  the KEY or VALUE int for the order
-         * @param main  the main map
          */
         View(final DataElement orderType) {
             super();
@@ -1642,7 +1668,6 @@
         /**
          * Constructor.
          * @param orderType  the KEY or VALUE int for the order
-         * @param main  the main map
          */
         ViewIterator(final DataElement orderType) {
             super();
@@ -1847,7 +1872,7 @@
         }
 
         private Map.Entry<V, K> createEntry(final Node<K, V> node) {
-            return new UnmodifiableMapEntry<V, K>(node.getValue(), node.getKey());
+            return new UnmodifiableMapEntry<>(node.getValue(), node.getKey());
         }
     }
 
@@ -1871,8 +1896,8 @@
          * Make a new cell with given key and value, and with null
          * links, and black (true) colors.
          *
-         * @param key
-         * @param value
+         * @param key the key of this node
+         * @param value the value of this node
          */
         @SuppressWarnings("unchecked")
         Node(final K key, final V value) {
@@ -1917,7 +1942,8 @@
          * Set this node's parent node.
          *
          * @param node  the new parent node
-         * @param index  the KEY or VALUE int
+         * @param dataElement  either {@link DataElement#KEY} key}
+         *                     or the {@link DataElement#VALUE value}.
          */
         private void setParent(final Node<K, V> node, final DataElement dataElement) {
             parentNode[dataElement.ordinal()] = node;
@@ -1926,7 +1952,8 @@
         /**
          * Get the parent node.
          *
-         * @param index  the KEY or VALUE int
+         * @param dataElement  either {@link DataElement#KEY} key}
+         *                     or the {@link DataElement#VALUE value}.
          * @return the parent node, may be null
          */
         private Node<K, V> getParent(final DataElement dataElement) {
@@ -1937,7 +1964,8 @@
          * Exchange colors with another node.
          *
          * @param node  the node to swap with
-         * @param index  the KEY or VALUE int
+         * @param dataElement  either {@link DataElement#KEY} key}
+         *                     or the {@link DataElement#VALUE value}.
          */
         private void swapColors(final Node<K, V> node, final DataElement dataElement) {
             // Swap colors -- old hacker's trick
@@ -1949,7 +1977,8 @@
         /**
          * Is this node black?
          *
-         * @param index  the KEY or VALUE int
+         * @param dataElement  either {@link DataElement#KEY} key}
+         *                     or the {@link DataElement#VALUE value}.
          * @return true if black (which is represented as a true boolean)
          */
         private boolean isBlack(final DataElement dataElement) {
@@ -1959,7 +1988,8 @@
         /**
          * Is this node red?
          *
-         * @param index  the KEY or VALUE int
+         * @param dataElement  either {@link DataElement#KEY} key}
+         *                     or the {@link DataElement#VALUE value}.
          * @return true if non-black
          */
         private boolean isRed(final DataElement dataElement) {
@@ -1969,7 +1999,8 @@
         /**
          * Make this node black.
          *
-         * @param index  the KEY or VALUE int
+         * @param dataElement  either {@link DataElement#KEY} key}
+         *                     or the {@link DataElement#VALUE value}.
          */
         private void setBlack(final DataElement dataElement) {
             blackColor[dataElement.ordinal()] = true;
@@ -1978,7 +2009,8 @@
         /**
          * Make this node red.
          *
-         * @param index  the KEY or VALUE int
+         * @param dataElement  either {@link DataElement#KEY} key}
+         *                     or the {@link DataElement#VALUE value}.
          */
         private void setRed(final DataElement dataElement) {
             blackColor[dataElement.ordinal()] = false;
@@ -1988,7 +2020,8 @@
          * Make this node the same color as another
          *
          * @param node  the node whose color we're adopting
-         * @param index  the KEY or VALUE int
+         * @param dataElement  either {@link DataElement#KEY} key}
+         *                     or the {@link DataElement#VALUE value}.
          */
         private void copyColor(final Node<K, V> node, final DataElement dataElement) {
             blackColor[dataElement.ordinal()] = node.blackColor[dataElement.ordinal()];
@@ -2028,7 +2061,7 @@
         /**
          * Optional operation that is not permitted in this implementation
          *
-         * @param ignored
+         * @param ignored this parameter is ignored.
          * @return does not return
          * @throws UnsupportedOperationException always
          */
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMap.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -31,8 +31,9 @@
  * <p>
  * Attempts to modify it will result in an UnsupportedOperationException.
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  * @since 3.0
- * @version $Id: UnmodifiableBidiMap.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public final class UnmodifiableBidiMap<K, V>
         extends AbstractBidiMapDecorator<K, V> implements Unmodifiable {
@@ -58,7 +59,7 @@
             final BidiMap<K, V> tmpMap = (BidiMap<K, V>) map;
             return tmpMap;
         }
-        return new UnmodifiableBidiMap<K, V>(map);
+        return new UnmodifiableBidiMap<>(map);
     }
 
     //-----------------------------------------------------------------------
@@ -127,7 +128,7 @@
     @Override
     public synchronized BidiMap<V, K> inverseBidiMap() {
         if (inverse == null) {
-            inverse = new UnmodifiableBidiMap<V, K>(decorated().inverseBidiMap());
+            inverse = new UnmodifiableBidiMap<>(decorated().inverseBidiMap());
             inverse.inverse = this;
         }
         return inverse;
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMap.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -31,8 +31,9 @@
  * <p>
  * Attempts to modify it will result in an UnsupportedOperationException.
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  * @since 3.0
- * @version $Id: UnmodifiableOrderedBidiMap.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public final class UnmodifiableOrderedBidiMap<K, V>
         extends AbstractOrderedBidiMapDecorator<K, V> implements Unmodifiable {
@@ -59,7 +60,7 @@
             final OrderedBidiMap<K, V> tmpMap = (OrderedBidiMap<K, V>) map;
             return tmpMap;
         }
-        return new UnmodifiableOrderedBidiMap<K, V>(map);
+        return new UnmodifiableOrderedBidiMap<>(map);
     }
 
     //-----------------------------------------------------------------------
@@ -138,7 +139,7 @@
      */
     public OrderedBidiMap<V, K> inverseOrderedBidiMap() {
         if (inverse == null) {
-            inverse = new UnmodifiableOrderedBidiMap<V, K>(decorated().inverseBidiMap());
+            inverse = new UnmodifiableOrderedBidiMap<>(decorated().inverseBidiMap());
             inverse.inverse = this;
         }
         return inverse;
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMap.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -33,8 +33,9 @@
  * <p>
  * Attempts to modify it will result in an {@link UnsupportedOperationException}.
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  * @since 3.0
- * @version $Id: UnmodifiableSortedBidiMap.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public final class UnmodifiableSortedBidiMap<K, V>
         extends AbstractSortedBidiMapDecorator<K, V> implements Unmodifiable {
@@ -60,7 +61,7 @@
             final SortedBidiMap<K, V> tmpMap = (SortedBidiMap<K, V>) map;
             return tmpMap;
         }
-        return new UnmodifiableSortedBidiMap<K, V>(map);
+        return new UnmodifiableSortedBidiMap<>(map);
     }
 
     //-----------------------------------------------------------------------
@@ -131,7 +132,7 @@
     @Override
     public SortedBidiMap<V, K> inverseBidiMap() {
         if (inverse == null) {
-            inverse = new UnmodifiableSortedBidiMap<V, K>(decorated().inverseBidiMap());
+            inverse = new UnmodifiableSortedBidiMap<>(decorated().inverseBidiMap());
             inverse.inverse = this;
         }
         return inverse;
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/BidiMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/BidiMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/BidiMap.java	2014-07-20 04:51:05.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/BidiMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -39,7 +39,6 @@
  * @param <V> the type of the values in the map
  *
  * @since 3.0
- * @version $Id: BidiMap.java 1612021 2014-07-20 04:51:05Z ggregory $
  */
 public interface BidiMap<K, V> extends IterableMap<K, V> {
 
@@ -71,6 +70,7 @@
      * @throws NullPointerException (optional) if the map limits the values to
      *  non-null and null was specified
      */
+    @Override
     V put(K key, V value);
 
     /**
@@ -140,5 +140,6 @@
      *
      * @return a set view of the values contained in this map
      */
+    @Override
     Set<V> values();
 }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/BoundedCollection.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/BoundedCollection.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/BoundedCollection.java	2013-04-30 18:55:24.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/BoundedCollection.java	2018-07-08 00:18:18.000000000 +0000
@@ -28,8 +28,8 @@
  * @see CollectionUtils#isFull
  * @see CollectionUtils#maxSize
  *
+ * @param <E> the type of elements in this collection
  * @since 3.0
- * @version $Id: BoundedCollection.java 1477779 2013-04-30 18:55:24Z tn $
  */
 public interface BoundedCollection<E> extends Collection<E> {
 
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/BoundedMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/BoundedMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/BoundedMap.java	2013-04-30 18:55:24.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/BoundedMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -23,8 +23,9 @@
  * maximum number of elements. This interface allows the querying of details
  * associated with the maximum number of elements.
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  * @since 3.0
- * @version $Id: BoundedMap.java 1477779 2013-04-30 18:55:24Z tn $
  */
 public interface BoundedMap<K, V> extends IterableMap<K, V> {
 
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/Closure.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/Closure.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/Closure.java	2013-11-19 00:47:34.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/Closure.java	2018-07-08 00:18:18.000000000 +0000
@@ -27,7 +27,6 @@
  *
  * @param <T> the type that the closure acts on
  * @since 1.0
- * @version $Id: Closure.java 1543261 2013-11-19 00:47:34Z ggregory $
  */
 public interface Closure<T> {
 
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/ClosureUtils.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/ClosureUtils.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/ClosureUtils.java	2015-11-14 20:38:02.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/ClosureUtils.java	2018-07-08 00:18:18.000000000 +0000
@@ -46,7 +46,7 @@
  * <li>Exception - always throws an exception
  * </ul>
  * <p>
- * Since v4.1 only closures which are considered to be unsafe are
+ * Since v4.1 only closures which are considered to be safe are
  * Serializable. Closures considered to be unsafe for serialization are:
  * <ul>
  * <li>Invoker
@@ -55,7 +55,6 @@
  * </ul>
  *
  * @since 3.0
- * @version $Id: ClosureUtils.java 1714362 2015-11-14 20:38:02Z tn $
  */
 public class ClosureUtils {
 
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/collection/AbstractCollectionDecorator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/collection/AbstractCollectionDecorator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/collection/AbstractCollectionDecorator.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/collection/AbstractCollectionDecorator.java	2018-07-08 00:18:18.000000000 +0000
@@ -50,7 +50,6 @@
  *
  * @param <E> the type of the elements in the collection
  * @since 3.0
- * @version $Id: AbstractCollectionDecorator.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public abstract class AbstractCollectionDecorator<E>
         implements Collection<E>, Serializable {
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/collection/CompositeCollection.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/collection/CompositeCollection.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/collection/CompositeCollection.java	2015-06-06 20:19:03.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/collection/CompositeCollection.java	2018-07-08 00:18:18.000000000 +0000
@@ -37,7 +37,6 @@
  *
  * @param <E> the type of the elements in the collection
  * @since 3.0
- * @version $Id: CompositeCollection.java 1683951 2015-06-06 20:19:03Z tn $
  */
 public class CompositeCollection<E> implements Collection<E>, Serializable {
 
@@ -48,7 +47,7 @@
     private CollectionMutator<E> mutator;
 
     /** Collections in the composite */
-    private final List<Collection<E>> all = new ArrayList<Collection<E>>();
+    private final List<Collection<E>> all = new ArrayList<>();
 
     /**
      * Create an empty CompositeCollection.
@@ -156,7 +155,7 @@
         if (all.isEmpty()) {
             return EmptyIterator.<E>emptyIterator();
         }
-        final IteratorChain<E> chain = new IteratorChain<E>();
+        final IteratorChain<E> chain = new IteratorChain<>();
         for (final Collection<E> item : all) {
             chain.addIterator(item.iterator());
         }
@@ -401,7 +400,7 @@
      *         The new collection is <i>not</i> backed by this composite.
      */
     public Collection<E> toCollection() {
-        return new ArrayList<E>(this);
+        return new ArrayList<>(this);
     }
 
     /**
@@ -415,7 +414,7 @@
 
     /**
      * Get the collection mutator to be used for this CompositeCollection.
-     * @return CollectionMutator<E>
+     * @return CollectionMutator&lt;E&gt;
      */
     protected CollectionMutator<E> getMutator() {
         return mutator;
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/collection/IndexedCollection.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/collection/IndexedCollection.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/collection/IndexedCollection.java	2015-06-01 22:41:31.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/collection/IndexedCollection.java	2018-07-08 00:18:18.000000000 +0000
@@ -39,7 +39,6 @@
  * @param <C> the type of object in the collection.
  *
  * @since 4.0
- * @version $Id: IndexedCollection.java 1683018 2015-06-01 22:41:31Z tn $
  */
 public class IndexedCollection<K, C> extends AbstractCollectionDecorator<C> {
 
@@ -71,7 +70,7 @@
      */
     public static <K, C> IndexedCollection<K, C> uniqueIndexedCollection(final Collection<C> coll,
                                                                          final Transformer<C, K> keyTransformer) {
-        return new IndexedCollection<K, C>(coll, keyTransformer,
+        return new IndexedCollection<>(coll, keyTransformer,
                                            MultiValueMap.<K, C>multiValueMap(new HashMap<K, Collection<C>>()),
                                            true);
     }
@@ -87,7 +86,7 @@
      */
     public static <K, C> IndexedCollection<K, C> nonUniqueIndexedCollection(final Collection<C> coll,
                                                                             final Transformer<C, K> keyTransformer) {
-        return new IndexedCollection<K, C>(coll, keyTransformer,
+        return new IndexedCollection<>(coll, keyTransformer,
                                            MultiValueMap.<K, C>multiValueMap(new HashMap<K, Collection<C>>()),
                                            false);
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/collection/package-info.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/collection/package-info.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/collection/package-info.java	2013-04-30 18:11:20.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/collection/package-info.java	2018-07-08 00:18:18.000000000 +0000
@@ -31,6 +31,5 @@
  *   <li>Indexed - provides a map-like view onto another collection
  * </ul>
  *
- * @version $Id: package-info.java 1477746 2013-04-30 18:11:20Z tn $
  */
 package org.apache.commons.collections4.collection;
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/collection/PredicatedCollection.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/collection/PredicatedCollection.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/collection/PredicatedCollection.java	2015-11-15 18:20:41.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/collection/PredicatedCollection.java	2018-07-08 00:18:18.000000000 +0000
@@ -54,7 +54,6 @@
  *
  * @param <E> the type of the elements in the collection
  * @since 3.0
- * @version $Id: PredicatedCollection.java 1714484 2015-11-15 18:20:41Z tn $
  */
 public class PredicatedCollection<E> extends AbstractCollectionDecorator<E> {
 
@@ -73,7 +72,7 @@
      * @since 4.1
      */
     public static <E> Builder<E> builder(final Predicate<? super E> predicate) {
-        return new Builder<E>(predicate);
+        return new Builder<>(predicate);
     }
 
     /**
@@ -84,7 +83,7 @@
      * @since 4.1
      */
     public static <E> Builder<E> notNullBuilder() {
-        return new Builder<E>(NotNullPredicate.<E>notNullPredicate());
+        return new Builder<>(NotNullPredicate.<E>notNullPredicate());
     }
 
     /**
@@ -103,7 +102,7 @@
      */
     public static <T> PredicatedCollection<T> predicatedCollection(final Collection<T> coll,
                                                                    final Predicate<? super T> predicate) {
-        return new PredicatedCollection<T>(coll, predicate);
+        return new PredicatedCollection<>(coll, predicate);
     }
 
     //-----------------------------------------------------------------------
@@ -209,10 +208,10 @@
         private final Predicate<? super E> predicate;
 
         /** The buffer containing valid elements. */
-        private final List<E> accepted = new ArrayList<E>();
+        private final List<E> accepted = new ArrayList<>();
 
         /** The buffer containing rejected elements. */
-        private final List<E> rejected = new ArrayList<E>();
+        private final List<E> rejected = new ArrayList<>();
 
         // -----------------------------------------------------------------------
         /**
@@ -257,7 +256,7 @@
          */
         public Builder<E> addAll(final Collection<? extends E> items) {
             if (items != null) {
-                for (E item : items) {
+                for (final E item : items) {
                     add(item);
                 }
             }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/collection/SynchronizedCollection.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/collection/SynchronizedCollection.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/collection/SynchronizedCollection.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/collection/SynchronizedCollection.java	2018-07-08 00:18:18.000000000 +0000
@@ -36,7 +36,6 @@
  *
  * @param <E> the type of the elements in the collection
  * @since 3.0
- * @version $Id: SynchronizedCollection.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class SynchronizedCollection<E> implements Collection<E>, Serializable {
 
@@ -58,7 +57,7 @@
      * @since 4.0
      */
     public static <T> SynchronizedCollection<T> synchronizedCollection(final Collection<T> coll) {
-        return new SynchronizedCollection<T>(coll);
+        return new SynchronizedCollection<>(coll);
     }
 
     //-----------------------------------------------------------------------
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/collection/TransformedCollection.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/collection/TransformedCollection.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/collection/TransformedCollection.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/collection/TransformedCollection.java	2018-07-08 00:18:18.000000000 +0000
@@ -34,7 +34,6 @@
  *
  * @param <E> the type of the elements in the collection
  * @since 3.0
- * @version $Id: TransformedCollection.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class TransformedCollection<E> extends AbstractCollectionDecorator<E> {
 
@@ -60,7 +59,7 @@
      */
     public static <E> TransformedCollection<E> transformingCollection(final Collection<E> coll,
             final Transformer<? super E, ? extends E> transformer) {
-        return new TransformedCollection<E>(coll, transformer);
+        return new TransformedCollection<>(coll, transformer);
     }
 
     /**
@@ -81,7 +80,7 @@
     public static <E> TransformedCollection<E> transformedCollection(final Collection<E> collection,
             final Transformer<? super E, ? extends E> transformer) {
 
-        final TransformedCollection<E> decorated = new TransformedCollection<E>(collection, transformer);
+        final TransformedCollection<E> decorated = new TransformedCollection<>(collection, transformer);
         // null collection & transformer are disallowed by the constructor call above
         if (collection.size() > 0) {
             @SuppressWarnings("unchecked") // collection is of type E
@@ -134,7 +133,7 @@
      * @return a transformed object
      */
     protected Collection<E> transform(final Collection<? extends E> coll) {
-        final List<E> list = new ArrayList<E>(coll.size());
+        final List<E> list = new ArrayList<>(coll.size());
         for (final E item : coll) {
             list.add(transform(item));
         }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/collection/UnmodifiableBoundedCollection.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/collection/UnmodifiableBoundedCollection.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/collection/UnmodifiableBoundedCollection.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/collection/UnmodifiableBoundedCollection.java	2018-07-08 00:18:18.000000000 +0000
@@ -37,8 +37,8 @@
  * <p>
  * Attempts to modify it will result in an UnsupportedOperationException.
  *
+ * @param <E> the type of elements in this collection
  * @since 3.0
- * @version $Id: UnmodifiableBoundedCollection.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public final class UnmodifiableBoundedCollection<E> extends AbstractCollectionDecorator<E>
         implements BoundedCollection<E>, Unmodifiable {
@@ -61,7 +61,7 @@
             final BoundedCollection<E> tmpColl = (BoundedCollection<E>) coll;
             return tmpColl;
         }
-        return new UnmodifiableBoundedCollection<E>(coll);
+        return new UnmodifiableBoundedCollection<>(coll);
     }
 
     /**
@@ -98,7 +98,7 @@
         if (coll instanceof BoundedCollection == false) {
             throw new IllegalArgumentException("Collection is not a bounded collection.");
         }
-        return new UnmodifiableBoundedCollection<E>((BoundedCollection<E>) coll);
+        return new UnmodifiableBoundedCollection<>((BoundedCollection<E>) coll);
     }
 
     /**
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/collection/UnmodifiableCollection.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/collection/UnmodifiableCollection.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/collection/UnmodifiableCollection.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/collection/UnmodifiableCollection.java	2018-07-08 00:18:18.000000000 +0000
@@ -31,7 +31,6 @@
  *
  * @param <E> the type of the elements in the collection
  * @since 3.0
- * @version $Id: UnmodifiableCollection.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public final class UnmodifiableCollection<E>
         extends AbstractCollectionDecorator<E>
@@ -57,7 +56,7 @@
             final Collection<T> tmpColl = (Collection<T>) coll;
             return tmpColl;
         }
-        return new UnmodifiableCollection<T>(coll);
+        return new UnmodifiableCollection<>(coll);
     }
 
     //-----------------------------------------------------------------------
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/CollectionUtils.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/CollectionUtils.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/CollectionUtils.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/CollectionUtils.java	2018-07-08 00:18:18.000000000 +0000
@@ -19,12 +19,12 @@
 import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
@@ -50,7 +50,6 @@
  * NOTE: From 4.0, method parameters will take {@link Iterable} objects when possible.
  *
  * @since 1.0
- * @version $Id: CollectionUtils.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class CollectionUtils {
 
@@ -112,7 +111,7 @@
             return getFreq(obj, cardinalityB);
         }
 
-        private final int getFreq(final Object obj, final Map<?, Integer> freqMap) {
+        private int getFreq(final Object obj, final Map<?, Integer> freqMap) {
             final Integer count = freqMap.get(obj);
             if (count != null) {
                 return count.intValue();
@@ -140,13 +139,14 @@
          */
         public SetOperationCardinalityHelper(final Iterable<? extends O> a, final Iterable<? extends O> b) {
             super(a, b);
-            elements = new HashSet<O>();
+            elements = new HashSet<>();
             addAll(elements, a);
             addAll(elements, b);
             // the resulting list must contain at least each unique element, but may grow
-            newList = new ArrayList<O>(elements.size());
+            newList = new ArrayList<>(elements.size());
         }
 
+        @Override
         public Iterator<O> iterator() {
             return elements.iterator();
         }
@@ -179,8 +179,7 @@
      * undesirable. This implementation only implements Collection.
      */
     @SuppressWarnings("rawtypes") // we deliberately use the raw type here
-    public static final Collection EMPTY_COLLECTION =
-        UnmodifiableCollection.unmodifiableCollection(new ArrayList<Object>());
+    public static final Collection EMPTY_COLLECTION = Collections.emptyList();
 
     /**
      * <code>CollectionUtils</code> should not normally be instantiated.
@@ -208,9 +207,8 @@
      * @param collection the collection, possibly <code>null</code>
      * @return an empty collection if the argument is <code>null</code>
      */
-    @SuppressWarnings("unchecked") // OK, empty collection is compatible with any type
     public static <T> Collection<T> emptyIfNull(final Collection<T> collection) {
-        return collection == null ? EMPTY_COLLECTION : collection;
+        return collection == null ? CollectionUtils.<T>emptyCollection() : collection;
     }
 
     /**
@@ -229,7 +227,7 @@
      * @see Collection#addAll
      */
     public static <O> Collection<O> union(final Iterable<? extends O> a, final Iterable<? extends O> b) {
-        final SetOperationCardinalityHelper<O> helper = new SetOperationCardinalityHelper<O>(a, b);
+        final SetOperationCardinalityHelper<O> helper = new SetOperationCardinalityHelper<>(a, b);
         for (final O obj : helper) {
             helper.setCardinality(obj, helper.max(obj));
         }
@@ -253,7 +251,7 @@
      * @see #containsAny
      */
     public static <O> Collection<O> intersection(final Iterable<? extends O> a, final Iterable<? extends O> b) {
-        final SetOperationCardinalityHelper<O> helper = new SetOperationCardinalityHelper<O>(a, b);
+        final SetOperationCardinalityHelper<O> helper = new SetOperationCardinalityHelper<>(a, b);
         for (final O obj : helper) {
             helper.setCardinality(obj, helper.min(obj));
         }
@@ -266,8 +264,8 @@
      * <p>
      * The cardinality of each element <i>e</i> in the returned
      * {@link Collection} will be equal to
-     * <tt>max(cardinality(<i>e</i>,<i>a</i>),cardinality(<i>e</i>,<i>b</i>)) - min(cardinality(<i>e</i>,<i>a</i>),
-     * cardinality(<i>e</i>,<i>b</i>))</tt>.
+     * <code>max(cardinality(<i>e</i>,<i>a</i>),cardinality(<i>e</i>,<i>b</i>)) - min(cardinality(<i>e</i>,<i>a</i>),
+     * cardinality(<i>e</i>,<i>b</i>))</code>.
      * <p>
      * This is equivalent to
      * {@code {@link #subtract subtract}({@link #union union(a,b)},{@link #intersection intersection(a,b)})}
@@ -281,7 +279,7 @@
      * @return the symmetric difference of the two collections
      */
     public static <O> Collection<O> disjunction(final Iterable<? extends O> a, final Iterable<? extends O> b) {
-        final SetOperationCardinalityHelper<O> helper = new SetOperationCardinalityHelper<O>(a, b);
+        final SetOperationCardinalityHelper<O> helper = new SetOperationCardinalityHelper<>(a, b);
         for (final O obj : helper) {
             helper.setCardinality(obj, helper.max(obj) - helper.min(obj));
         }
@@ -330,8 +328,8 @@
     public static <O> Collection<O> subtract(final Iterable<? extends O> a,
                                              final Iterable<? extends O> b,
                                              final Predicate<O> p) {
-        final ArrayList<O> list = new ArrayList<O>();
-        final HashBag<O> bag = new HashBag<O>();
+        final ArrayList<O> list = new ArrayList<>();
+        final HashBag<O> bag = new HashBag<>();
         for (final O element : b) {
             if (p.evaluate(element)) {
                 bag.add(element);
@@ -370,32 +368,59 @@
     public static boolean containsAll(final Collection<?> coll1, final Collection<?> coll2) {
         if (coll2.isEmpty()) {
             return true;
-        } else {
-            final Iterator<?> it = coll1.iterator();
-            final Set<Object> elementsAlreadySeen = new HashSet<Object>();
-            for (final Object nextElement : coll2) {
-                if (elementsAlreadySeen.contains(nextElement)) {
-                    continue;
-                }
+        }
+        final Iterator<?> it = coll1.iterator();
+        final Set<Object> elementsAlreadySeen = new HashSet<>();
+        for (final Object nextElement : coll2) {
+            if (elementsAlreadySeen.contains(nextElement)) {
+                continue;
+            }
 
-                boolean foundCurrentElement = false;
-                while (it.hasNext()) {
-                    final Object p = it.next();
-                    elementsAlreadySeen.add(p);
-                    if (nextElement == null ? p == null : nextElement.equals(p)) {
-                        foundCurrentElement = true;
-                        break;
-                    }
+            boolean foundCurrentElement = false;
+            while (it.hasNext()) {
+                final Object p = it.next();
+                elementsAlreadySeen.add(p);
+                if (nextElement == null ? p == null : nextElement.equals(p)) {
+                    foundCurrentElement = true;
+                    break;
                 }
+            }
 
-                if (foundCurrentElement) {
-                    continue;
-                } else {
-                    return false;
+            if (!foundCurrentElement) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Returns <code>true</code> iff at least one element is in both collections.
+     * <p>
+     * In other words, this method returns <code>true</code> iff the
+     * {@link #intersection} of <i>coll1</i> and <i>coll2</i> is not empty.
+     *
+     * @param <T> the type of object to lookup in <code>coll1</code>.
+     * @param coll1  the first collection, must not be null
+     * @param coll2  the second collection, must not be null
+     * @return <code>true</code> iff the intersection of the collections is non-empty
+     * @since 4.2
+     * @see #intersection
+     */
+    public static <T> boolean containsAny(final Collection<?> coll1, @SuppressWarnings("unchecked") final T... coll2) {
+        if (coll1.size() < coll2.length) {
+            for (final Object aColl1 : coll1) {
+                if (ArrayUtils.contains(coll2, aColl1)) {
+                    return true;
+                }
+            }
+        } else {
+            for (final Object aColl2 : coll2) {
+                if (coll1.contains(aColl2)) {
+                    return true;
                 }
             }
-            return true;
         }
+        return false;
     }
 
     /**
@@ -435,12 +460,12 @@
      * Only those elements present in the collection will appear as
      * keys in the map.
      *
-     * @param <O>  the type of object in the returned {@link Map}. This is a super type of <I>.
+     * @param <O>  the type of object in the returned {@link Map}. This is a super type of &lt;I&gt;.
      * @param coll  the collection to get the cardinality map for, must not be null
      * @return the populated cardinality map
      */
     public static <O> Map<O, Integer> getCardinalityMap(final Iterable<? extends O> coll) {
-        final Map<O, Integer> count = new HashMap<O, Integer>();
+        final Map<O, Integer> count = new HashMap<>();
         for (final O obj : coll) {
             final Integer c = count.get(obj);
             if (c == null) {
@@ -465,7 +490,7 @@
      * @see Collection#containsAll
      */
     public static boolean isSubCollection(final Collection<?> a, final Collection<?> b) {
-        final CardinalityHelper<Object> helper = new CardinalityHelper<Object>(a, b);
+        final CardinalityHelper<Object> helper = new CardinalityHelper<>(a, b);
         for (final Object obj : a) {
             if (helper.freqA(obj) > helper.freqB(obj)) {
                 return false;
@@ -486,7 +511,7 @@
      * <ul>
      *    <li><code>a.size()</code> and <code>b.size()</code> represent the
      *    total cardinality of <i>a</i> and <i>b</i>, resp. </li>
-     *    <li><code>a.size() < Integer.MAXVALUE</code></li>
+     *    <li><code>a.size() &lt; Integer.MAXVALUE</code></li>
      * </ul>
      *
      * @param a  the first (sub?) collection, must not be null
@@ -515,7 +540,7 @@
         if(a.size() != b.size()) {
             return false;
         }
-        final CardinalityHelper<Object> helper = new CardinalityHelper<Object>(a, b);
+        final CardinalityHelper<Object> helper = new CardinalityHelper<>(a, b);
         if(helper.cardinalityA.size() != helper.cardinalityB.size()) {
             return false;
         }
@@ -561,6 +586,7 @@
 
         @SuppressWarnings({ "unchecked", "rawtypes" })
         final Transformer<E, ?> transformer = new Transformer() {
+            @Override
             public EquatorWrapper<?> transform(final Object input) {
                 return new EquatorWrapper(equator, input);
             }
@@ -613,7 +639,7 @@
      * @param obj the object to find the cardinality of
      * @param coll the {@link Iterable} to search
      * @param <O> the type of object that the {@link Iterable} may contain.
-     * @return the the number of occurrences of obj in coll
+     * @return the number of occurrences of obj in coll
      * @throws NullPointerException if coll is null
      * @deprecated since 4.1, use {@link IterableUtils#frequency(Iterable, Object)} instead.
      *   Be aware that the order of parameters has changed.
@@ -828,14 +854,14 @@
      */
     @Deprecated
     public static <C> boolean exists(final Iterable<C> input, final Predicate<? super C> predicate) {
-        return predicate == null ? false : IterableUtils.matchesAny(input, predicate);
+        return predicate != null && IterableUtils.matchesAny(input, predicate);
     }
 
     /**
      * Answers true if a predicate is true for every element of a
      * collection.
      * <p>
-     * A <code>null</code> predicate returns false.<br/>
+     * A <code>null</code> predicate returns false.<br>
      * A <code>null</code> or empty collection returns true.
      *
      * @param <C>  the type of object the {@link Iterable} contains
@@ -848,7 +874,7 @@
      */
     @Deprecated
     public static <C> boolean matchesAll(final Iterable<C> input, final Predicate<? super C> predicate) {
-        return predicate == null ? false : IterableUtils.matchesAll(input, predicate);
+        return predicate != null && IterableUtils.matchesAll(input, predicate);
     }
 
     /**
@@ -926,7 +952,7 @@
      * @since 4.1
      */
     public static <O, R extends Collection<? super O>> R select(final Iterable<? extends O> inputCollection,
-            final Predicate<? super O> predicate, R outputCollection, R rejectedCollection) {
+            final Predicate<? super O> predicate, final R outputCollection, final R rejectedCollection) {
 
         if (inputCollection != null && predicate != null) {
             for (final O element : inputCollection) {
@@ -1160,7 +1186,7 @@
      * @return {@code true} if the collection was changed, {@code false} otherwise
      * @throws NullPointerException if the collection or array is null
      */
-    public static <C> boolean addAll(final Collection<C> collection, final C[] elements) {
+    public static <C> boolean addAll(final Collection<C> collection, final C... elements) {
         boolean changed = false;
         for (final C element : elements) {
             changed |= collection.add(element);
@@ -1248,7 +1274,7 @@
      * @throws IllegalArgumentException if the object type is invalid
      */
     public static Object get(final Object object, final int index) {
-        int i = index;
+        final int i = index;
         if (i < 0) {
             throw new IndexOutOfBoundsException("Index cannot be negative: " + i);
         }
@@ -1264,9 +1290,6 @@
         } else if (object instanceof Iterable<?>) {
             final Iterable<?> iterable = (Iterable<?>) object;
             return IterableUtils.get(iterable, i);
-        } else if (object instanceof Collection<?>) {
-            final Iterator<?> iterator = ((Collection<?>) object).iterator();
-            return IteratorUtils.get(iterator, i);
         } else if (object instanceof Enumeration<?>) {
             final Enumeration<?> it = (Enumeration<?>) object;
             return EnumerationUtils.get(it, i);
@@ -1311,7 +1334,7 @@
      *
      * @param object  the object to get the size of, may be null
      * @return the size of the specified collection or 0 if the object was null
-     * @throws IllegalArgumentException thrown if object is not recognised
+     * @throws IllegalArgumentException thrown if object is not recognized
      * @since 3.1
      */
     public static int size(final Object object) {
@@ -1362,7 +1385,7 @@
      *
      * @param object  the object to get the size of, may be null
      * @return true if empty or null
-     * @throws IllegalArgumentException thrown if object is not recognised
+     * @throws IllegalArgumentException thrown if object is not recognized
      * @since 3.2
      */
     public static boolean sizeIsEmpty(final Object object) {
@@ -1512,8 +1535,8 @@
      * @throws NullPointerException if either collection is null
      * @since 4.0
      */
-    public static <O extends Comparable<? super O>> List<O> collate(Iterable<? extends O> a,
-                                                                    Iterable<? extends O> b) {
+    public static <O extends Comparable<? super O>> List<O> collate(final Iterable<? extends O> a,
+                                                                    final Iterable<? extends O> b) {
         return collate(a, b, ComparatorUtils.<O>naturalComparator(), true);
     }
 
@@ -1587,24 +1610,23 @@
         final int totalSize = a instanceof Collection<?> && b instanceof Collection<?> ?
                 Math.max(1, ((Collection<?>) a).size() + ((Collection<?>) b).size()) : 10;
 
-        final Iterator<O> iterator = new CollatingIterator<O>(c, a.iterator(), b.iterator());
+        final Iterator<O> iterator = new CollatingIterator<>(c, a.iterator(), b.iterator());
         if (includeDuplicates) {
             return IteratorUtils.toList(iterator, totalSize);
-        } else {
-            final ArrayList<O> mergedList = new ArrayList<O>(totalSize);
+        }
+        final ArrayList<O> mergedList = new ArrayList<>(totalSize);
 
-            O lastItem = null;
-            while (iterator.hasNext()) {
-                final O item = iterator.next();
-                if (lastItem == null || !lastItem.equals(item)) {
-                    mergedList.add(item);
-                }
-                lastItem = item;
+        O lastItem = null;
+        while (iterator.hasNext()) {
+            final O item = iterator.next();
+            if (lastItem == null || !lastItem.equals(item)) {
+                mergedList.add(item);
             }
-
-            mergedList.trimToSize();
-            return mergedList;
+            lastItem = item;
         }
+
+        mergedList.trimToSize();
+        return mergedList;
     }
 
     //-----------------------------------------------------------------------
@@ -1628,8 +1650,8 @@
      * @since 4.0
      */
     public static <E> Collection<List<E>> permutations(final Collection<E> collection) {
-        final PermutationIterator<E> it = new PermutationIterator<E>(collection);
-        final Collection<List<E>> result = new LinkedList<List<E>>();
+        final PermutationIterator<E> it = new PermutationIterator<>(collection);
+        final Collection<List<E>> result = new ArrayList<>();
         while (it.hasNext()) {
             result.add(it.next());
         }
@@ -1693,17 +1715,18 @@
                                               final Equator<? super E> equator) {
 
         final Transformer<E, EquatorWrapper<E>> transformer = new Transformer<E, EquatorWrapper<E>>() {
-            public EquatorWrapper<E> transform(E input) {
-                return new EquatorWrapper<E>(equator, input);
+            @Override
+            public EquatorWrapper<E> transform(final E input) {
+                return new EquatorWrapper<>(equator, input);
             }
         };
 
         final Set<EquatorWrapper<E>> retainSet =
                 collect(retain, transformer, new HashSet<EquatorWrapper<E>>());
 
-        final List<E> list = new ArrayList<E>();
+        final List<E> list = new ArrayList<>();
         for (final E element : collection) {
-            if (retainSet.contains(new EquatorWrapper<E>(equator, element))) {
+            if (retainSet.contains(new EquatorWrapper<>(equator, element))) {
                 list.add(element);
             }
         }
@@ -1768,17 +1791,18 @@
                                               final Equator<? super E> equator) {
 
         final Transformer<E, EquatorWrapper<E>> transformer = new Transformer<E, EquatorWrapper<E>>() {
-            public EquatorWrapper<E> transform(E input) {
-                return new EquatorWrapper<E>(equator, input);
+            @Override
+            public EquatorWrapper<E> transform(final E input) {
+                return new EquatorWrapper<>(equator, input);
             }
         };
 
         final Set<EquatorWrapper<E>> removeSet =
                 collect(remove, transformer, new HashSet<EquatorWrapper<E>>());
 
-        final List<E> list = new ArrayList<E>();
+        final List<E> list = new ArrayList<>();
         for (final E element : collection) {
-            if (!removeSet.contains(new EquatorWrapper<E>(equator, element))) {
+            if (!removeSet.contains(new EquatorWrapper<>(equator, element))) {
                 list.add(element);
             }
         }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/comparators/BooleanComparator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/comparators/BooleanComparator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/comparators/BooleanComparator.java	2015-06-06 20:19:03.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/comparators/BooleanComparator.java	2018-07-08 00:18:18.000000000 +0000
@@ -28,7 +28,6 @@
  * @see #booleanComparator(boolean)
  *
  * @since 3.0
- * @version $Id: BooleanComparator.java 1683951 2015-06-06 20:19:03Z tn $
  */
 public final class BooleanComparator implements Comparator<Boolean>, Serializable {
 
@@ -48,12 +47,13 @@
     /**
      * Returns a BooleanComparator instance that sorts
      * <code>true</code> values before <code>false</code> values.
-     * <p />
+     * <p>
      * Clients are encouraged to use the value returned from
      * this method instead of constructing a new instance
      * to reduce allocation and garbage collection overhead when
      * multiple BooleanComparators may be used in the same
      * virtual machine.
+     * </p>
      *
      * @return the true first singleton BooleanComparator
      */
@@ -64,12 +64,13 @@
     /**
      * Returns a BooleanComparator instance that sorts
      * <code>false</code> values before <code>true</code> values.
-     * <p />
+     * <p>
      * Clients are encouraged to use the value returned from
      * this method instead of constructing a new instance
      * to reduce allocation and garbage collection overhead when
      * multiple BooleanComparators may be used in the same
      * virtual machine.
+     * </p>
      *
      * @return the false first singleton BooleanComparator
      */
@@ -81,12 +82,13 @@
      * Returns a BooleanComparator instance that sorts
      * <code><i>trueFirst</i></code> values before
      * <code>&#x21;<i>trueFirst</i></code> values.
-     * <p />
+     * <p>
      * Clients are encouraged to use the value returned from
      * this method instead of constructing a new instance
      * to reduce allocation and garbage collection overhead when
      * multiple BooleanComparators may be used in the same
      * virtual machine.
+     * </p>
      *
      * @param trueFirst when <code>true</code>, sort
      * <code>true</code> <code>Boolean</code>s before <code>false</code>
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/comparators/ComparableComparator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/comparators/ComparableComparator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/comparators/ComparableComparator.java	2015-06-06 20:19:03.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/comparators/ComparableComparator.java	2018-07-08 00:18:18.000000000 +0000
@@ -35,9 +35,9 @@
  * This is no longer the case. See {@link #compare(Object, Object) compare} for
  * details.
  *
- * @since 2.0
- * @version $Id: ComparableComparator.java 1683951 2015-06-06 20:19:03Z tn $
+ * @param <E> the type of objects compared by this comparator
  *
+ * @since 2.0
  * @see java.util.Collections#reverseOrder()
  */
 public class ComparableComparator<E extends Comparable<? super E>> implements Comparator<E>, Serializable {
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/comparators/ComparatorChain.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/comparators/ComparatorChain.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/comparators/ComparatorChain.java	2015-06-06 20:19:03.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/comparators/ComparatorChain.java	2018-07-08 00:18:18.000000000 +0000
@@ -44,8 +44,8 @@
  * thread-safe at construction time, but it <i>is</i> thread-safe to perform
  * multiple comparisons after all the setup operations are complete.
  *
+ * @param <E> the type of objects compared by this comparator
  * @since 2.0
- * @version $Id: ComparatorChain.java 1683951 2015-06-06 20:19:03Z tn $
  */
 public class ComparatorChain<E> implements Comparator<E>, Serializable {
 
@@ -88,7 +88,7 @@
      * @param reverse    false = forward sort; true = reverse sort
      */
     public ComparatorChain(final Comparator<E> comparator, final boolean reverse) {
-        comparatorChain = new ArrayList<Comparator<E>>(1);
+        comparatorChain = new ArrayList<>(1);
         comparatorChain.add(comparator);
         orderingBits = new BitSet(1);
         if (reverse == true) {
@@ -161,7 +161,7 @@
      *
      * @param index      index of the Comparator to replace
      * @param comparator Comparator to place at the given index
-     * @exception IndexOutOfBoundsException
+     * @throws IndexOutOfBoundsException
      *                   if index &lt; 0 or index &gt;= size()
      */
     public void setComparator(final int index, final Comparator<E> comparator) throws IndexOutOfBoundsException {
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/comparators/FixedOrderComparator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/comparators/FixedOrderComparator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/comparators/FixedOrderComparator.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/comparators/FixedOrderComparator.java	2018-07-08 00:18:18.000000000 +0000
@@ -43,8 +43,8 @@
  * <p>
  * This class is Serializable from Commons Collections 4.0.
  *
+ * @param <T> the type of objects compared by this comparator
  * @since 3.0
- * @version $Id: FixedOrderComparator.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class FixedOrderComparator<T> implements Comparator<T>, Serializable {
 
@@ -55,12 +55,12 @@
      * Unknown object behavior enum.
      * @since 4.0
      */
-    public static enum UnknownObjectBehavior {
+    public enum UnknownObjectBehavior {
         BEFORE, AFTER, EXCEPTION;
     }
 
     /** Internal map of object to position */
-    private final Map<T, Integer> map = new HashMap<T, Integer>();
+    private final Map<T, Integer> map = new HashMap<>();
 
     /** Counter used in determining the position in the map */
     private int counter = 0;
@@ -214,7 +214,7 @@
      * Compares two objects according to the order of this Comparator.
      * <p>
      * It is important to note that this class will throw an IllegalArgumentException
-     * in the case of an unrecognised object. This is not specified in the
+     * in the case of an unrecognized object. This is not specified in the
      * Comparator interface, but is the most appropriate exception.
      *
      * @param obj1  the first object to compare
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/comparators/NullComparator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/comparators/NullComparator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/comparators/NullComparator.java	2015-06-06 20:19:03.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/comparators/NullComparator.java	2018-07-08 00:18:18.000000000 +0000
@@ -25,8 +25,8 @@
  * A Comparator that will compare nulls to be either lower or higher than
  * other objects.
  *
+ * @param <E> the type of objects compared by this comparator
  * @since 2.0
- * @version $Id: NullComparator.java 1683951 2015-06-06 20:19:03Z tn $
  */
 public class NullComparator<E> implements Comparator<E>, Serializable {
 
@@ -66,7 +66,7 @@
      *  non-<code>null</code> objects.  This argument cannot be
      *  <code>null</code>
      *
-     *  @exception NullPointerException if <code>nonNullComparator</code> is
+     *  @throws NullPointerException if <code>nonNullComparator</code> is
      *  <code>null</code>
      **/
     public NullComparator(final Comparator<? super E> nonNullComparator) {
@@ -106,7 +106,7 @@
      *  that <code>null</code> should be compared as lower than a
      *  non-<code>null</code> object.
      *
-     *  @exception NullPointerException if <code>nonNullComparator</code> is
+     *  @throws NullPointerException if <code>nonNullComparator</code> is
      *  <code>null</code>
      **/
     public NullComparator(final Comparator<? super E> nonNullComparator, final boolean nullsAreHigh) {
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/comparators/package-info.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/comparators/package-info.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/comparators/package-info.java	2013-04-30 18:16:48.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/comparators/package-info.java	2018-07-08 00:18:18.000000000 +0000
@@ -23,6 +23,5 @@
  * which is a single class that uses static methods to construct instances
  * of the classes in this package.
  *
- * @version $Id: package-info.java 1477747 2013-04-30 18:16:48Z tn $
  */
 package org.apache.commons.collections4.comparators;
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/comparators/ReverseComparator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/comparators/ReverseComparator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/comparators/ReverseComparator.java	2015-06-06 20:19:03.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/comparators/ReverseComparator.java	2018-07-08 00:18:18.000000000 +0000
@@ -25,9 +25,9 @@
  * Reverses the order of another comparator by reversing the arguments
  * to its {@link #compare(Object, Object) compare} method.
  *
- * @since 2.0
- * @version $Id: ReverseComparator.java 1683951 2015-06-06 20:19:03Z tn $
+ * @param <E> the type of objects compared by this comparator
  *
+ * @since 2.0
  * @see java.util.Collections#reverseOrder()
  */
 public class ReverseComparator<E> implements Comparator<E>, Serializable {
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/comparators/TransformingComparator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/comparators/TransformingComparator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/comparators/TransformingComparator.java	2015-06-06 20:19:03.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/comparators/TransformingComparator.java	2018-07-08 00:18:18.000000000 +0000
@@ -29,8 +29,10 @@
  * <p>
  * This class is Serializable from Commons Collections 4.0.
  *
+ * @param <I> the input type to the transformer
+ * @param <O> the output type from the transformer
+ *
  * @since 2.1
- * @version $Id: TransformingComparator.java 1683951 2015-06-06 20:19:03Z tn $
  *
  * @see org.apache.commons.collections4.Transformer
  * @see org.apache.commons.collections4.comparators.ComparableComparator
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/ComparatorUtils.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/ComparatorUtils.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/ComparatorUtils.java	2014-05-02 08:58:40.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/ComparatorUtils.java	2018-07-08 00:18:18.000000000 +0000
@@ -36,7 +36,6 @@
  * in the <code>comparators</code> subpackage.
  *
  * @since 2.1
- * @version $Id: ComparatorUtils.java 1591832 2014-05-02 08:58:40Z tn $
  */
 public class ComparatorUtils {
 
@@ -75,7 +74,7 @@
      * @see ComparatorChain
      */
     public static <E> Comparator<E> chainedComparator(final Comparator<E>... comparators) {
-        final ComparatorChain<E> chain = new ComparatorChain<E>();
+        final ComparatorChain<E> chain = new ComparatorChain<>();
         for (final Comparator<E> comparator : comparators) {
             if (comparator == null) {
                 throw new NullPointerException("Comparator cannot be null");
@@ -113,7 +112,7 @@
      * @see ReverseComparator
      */
     public static <E> Comparator<E> reversedComparator(final Comparator<E> comparator) {
-        return new ReverseComparator<E>(comparator);
+        return new ReverseComparator<>(comparator);
     }
 
     /**
@@ -149,7 +148,7 @@
         if (comparator == null) {
             comparator = NATURAL_COMPARATOR;
         }
-        return new NullComparator<E>(comparator, false);
+        return new NullComparator<>(comparator, false);
     }
 
     /**
@@ -169,7 +168,7 @@
         if (comparator == null) {
             comparator = NATURAL_COMPARATOR;
         }
-        return new NullComparator<E>(comparator, true);
+        return new NullComparator<>(comparator, true);
     }
 
     /**
@@ -193,7 +192,7 @@
         if (comparator == null) {
             comparator = NATURAL_COMPARATOR;
         }
-        return new TransformingComparator<I, O>(transformer, comparator);
+        return new TransformingComparator<>(transformer, comparator);
     }
 
     /**
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/EnumerationUtils.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/EnumerationUtils.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/EnumerationUtils.java	2015-06-01 21:53:01.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/EnumerationUtils.java	2018-07-08 00:18:18.000000000 +0000
@@ -27,7 +27,6 @@
  * Provides utility methods for {@link Enumeration} instances.
  *
  * @since 3.0
- * @version $Id: EnumerationUtils.java 1683009 2015-06-01 21:53:01Z tn $
  */
 public class EnumerationUtils {
 
@@ -58,9 +57,8 @@
             i--;
             if (i == -1) {
                 return e.nextElement();
-            } else {
-                e.nextElement();
             }
+            e.nextElement();
         }
         throw new IndexOutOfBoundsException("Entry does not exist: " + i);
     }
@@ -77,7 +75,7 @@
      * @throws NullPointerException if the enumeration parameter is <code>null</code>.
      */
     public static <E> List<E> toList(final Enumeration<? extends E> enumeration) {
-        return IteratorUtils.toList(new EnumerationIterator<E>(enumeration));
+        return IteratorUtils.toList(new EnumerationIterator<>(enumeration));
     }
 
     /**
@@ -88,7 +86,7 @@
      * @return a list containing all tokens of the given StringTokenizer
      */
     public static List<String> toList(final StringTokenizer stringTokenizer) {
-        final List<String> result = new ArrayList<String>(stringTokenizer.countTokens());
+        final List<String> result = new ArrayList<>(stringTokenizer.countTokens());
         while (stringTokenizer.hasMoreTokens()) {
             result.add(stringTokenizer.nextToken());
         }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/Equator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/Equator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/Equator.java	2013-11-10 22:19:29.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/Equator.java	2018-07-08 00:18:18.000000000 +0000
@@ -18,7 +18,6 @@
  *
  * @param <T> the types of object this {@link Equator} can evaluate.
  * @since 4.0
- * @version $Id: Equator.java 1540567 2013-11-10 22:19:29Z tn $
  */
 public interface Equator<T> {
     /**
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/Factory.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/Factory.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/Factory.java	2013-11-19 00:45:38.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/Factory.java	2018-07-08 00:18:18.000000000 +0000
@@ -29,7 +29,6 @@
  * @param <T> the type that the factory creates
  *
  * @since 2.1
- * @version $Id: Factory.java 1543256 2013-11-19 00:45:38Z ggregory $
  */
 public interface Factory<T> {
 
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/FactoryUtils.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/FactoryUtils.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/FactoryUtils.java	2015-11-14 20:38:02.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/FactoryUtils.java	2018-07-08 00:18:18.000000000 +0000
@@ -32,7 +32,7 @@
  * <li>Exception - always throws an exception
  * </ul>
  * <p>
- * Since v4.1 only factories which are considered to be unsafe are
+ * Since v4.1 only factories which are considered to be safe are
  * Serializable. Factories considered to be unsafe for serialization are:
  * <ul>
  * <li>Prototype
@@ -40,7 +40,6 @@
  * </ul>
  *
  * @since 3.0
- * @version $Id: FactoryUtils.java 1714362 2015-11-14 20:38:02Z tn $
  */
 public class FactoryUtils {
 
@@ -94,11 +93,12 @@
      * Creates a Factory that will return a clone of the same prototype object
      * each time the factory is used. The prototype will be cloned using one of these
      * techniques (in order):
+     *
      * <ul>
-     * <li>public clone method
-     * <li>public copy constructor
-     * <li>serialization clone
-     * <ul>
+     * <li>public clone method</li>
+     * <li>public copy constructor</li>
+     * <li>serialization clone</li>
+     * </ul>
      *
      * @see org.apache.commons.collections4.functors.PrototypeFactory
      *
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/FluentIterable.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/FluentIterable.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/FluentIterable.java	2015-06-08 20:06:29.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/FluentIterable.java	2018-07-08 00:18:18.000000000 +0000
@@ -47,7 +47,7 @@
  * List&lt;String&gt; result =
  *   FluentIterable
  *       .of(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)
- *       .filter(new Predicate<Integer>() {
+ *       .filter(new Predicate&lt;Integer&gt;() {
  *                   public boolean evaluate(Integer number) {
  *                        return number % 2 == 0;
  *                   }
@@ -61,7 +61,6 @@
  *
  * @param <E>  the element type
  * @since 4.1
- * @version $Id: FluentIterable.java 1684264 2015-06-08 20:06:29Z tn $
  */
 public class FluentIterable<E> implements Iterable<E> {
 
@@ -92,7 +91,7 @@
      * @return a new FluentIterable containing the singleton
      */
     public static <T> FluentIterable<T> of(final T singleton) {
-        return of(IteratorUtils.asIterable(new SingletonIterator<T>(singleton, false)));
+        return of(IteratorUtils.asIterable(new SingletonIterator<>(singleton, false)));
     }
 
     /**
@@ -125,9 +124,8 @@
         IterableUtils.checkNotNull(iterable);
         if (iterable instanceof FluentIterable<?>) {
             return (FluentIterable<T>) iterable;
-        } else {
-            return new FluentIterable<T>(iterable);
         }
+        return new FluentIterable<>(iterable);
     }
 
     // Constructor
@@ -192,7 +190,7 @@
      * @param other  the other iterable to collate, may not be null
      * @return a new iterable, collating this iterable with the other in natural order
      * @throws NullPointerException if other is null
-     * @see {@link org.apache.commons.collections4.iterators.CollatingIterator CollatingIterator}
+     * @see org.apache.commons.collections4.iterators.CollatingIterator
      */
     public FluentIterable<E> collate(final Iterable<? extends E> other) {
         return of(IterableUtils.collatedIterable(iterable, other));
@@ -217,7 +215,7 @@
      * @param other  the other iterable to collate, may not be null
      * @return a new iterable, collating this iterable with the other in natural order
      * @throws NullPointerException if other is null
-     * @see {@link org.apache.commons.collections4.iterators.CollatingIterator CollatingIterator}
+     * @see org.apache.commons.collections4.iterators.CollatingIterator
      */
     public FluentIterable<E> collate(final Iterable<? extends E> other,
                                      final Comparator<? super E> comparator) {
@@ -231,7 +229,7 @@
      * <p>
      * Calling this method is equivalent to:
      * <pre>
-     *   FluentIterable<E> someIterable = ...;
+     *   FluentIterable&lt;E&gt; someIterable = ...;
      *   FluentIterable.of(someIterable.toList());
      * </pre>
      *
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/FunctorException.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/FunctorException.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/FunctorException.java	2013-04-30 18:55:24.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/FunctorException.java	2018-07-08 00:18:18.000000000 +0000
@@ -21,7 +21,6 @@
  * If required, a root cause error can be wrapped within this one.
  *
  * @since 3.0
- * @version $Id: FunctorException.java 1477779 2013-04-30 18:55:24Z tn $
  */
 public class FunctorException extends RuntimeException {
 
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/AbstractQuantifierPredicate.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/AbstractQuantifierPredicate.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/AbstractQuantifierPredicate.java	2013-11-18 21:21:32.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/AbstractQuantifierPredicate.java	2018-07-08 00:18:18.000000000 +0000
@@ -24,7 +24,6 @@
  * Abstract base class for quantification predicates, e.g. All, Any, None.
  *
  * @since 4.0
- * @version $Id: AbstractQuantifierPredicate.java 1543167 2013-11-18 21:21:32Z ggregory $
  */
 public abstract class AbstractQuantifierPredicate<T> implements PredicateDecorator<T>, Serializable {
 
@@ -49,6 +48,7 @@
      * @return a copy of the predicates
      * @since 3.1
      */
+    @Override
     public Predicate<? super T>[] getPredicates() {
         return FunctorUtils.<T>copy(iPredicates);
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/AllPredicate.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/AllPredicate.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/AllPredicate.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/AllPredicate.java	2018-07-08 00:18:18.000000000 +0000
@@ -33,7 +33,6 @@
  * threw an exception.
  *
  * @since 3.0
- * @version $Id: AllPredicate.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public final class AllPredicate<T> extends AbstractQuantifierPredicate<T> {
 
@@ -61,7 +60,7 @@
             return coerce(predicates[0]);
         }
 
-        return new AllPredicate<T>(FunctorUtils.copy(predicates));
+        return new AllPredicate<>(FunctorUtils.copy(predicates));
     }
 
     /**
@@ -84,7 +83,7 @@
         if (preds.length == 1) {
             return coerce(preds[0]);
         }
-        return new AllPredicate<T>(preds);
+        return new AllPredicate<>(preds);
     }
 
     /**
@@ -103,6 +102,7 @@
      * @param object  the input object
      * @return true if all decorated predicates return true
      */
+    @Override
     public boolean evaluate(final T object) {
         for (final Predicate<? super T> iPredicate : iPredicates) {
             if (!iPredicate.evaluate(object)) {
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/AndPredicate.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/AndPredicate.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/AndPredicate.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/AndPredicate.java	2018-07-08 00:18:18.000000000 +0000
@@ -24,7 +24,6 @@
  * Predicate implementation that returns true if both the predicates return true.
  *
  * @since 3.0
- * @version $Id: AndPredicate.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public final class AndPredicate<T> implements PredicateDecorator<T>, Serializable {
 
@@ -50,7 +49,7 @@
         if (predicate1 == null || predicate2 == null) {
             throw new NullPointerException("Predicate must not be null");
         }
-        return new AndPredicate<T>(predicate1, predicate2);
+        return new AndPredicate<>(predicate1, predicate2);
     }
 
     /**
@@ -72,6 +71,7 @@
      * @param object  the input object
      * @return true if both decorated predicates return true
      */
+    @Override
     public boolean evaluate(final T object) {
        return iPredicate1.evaluate(object) && iPredicate2.evaluate(object);
     }
@@ -82,6 +82,7 @@
      * @return the predicates
      * @since 3.1
      */
+    @Override
     @SuppressWarnings("unchecked")
     public Predicate<? super T>[] getPredicates() {
         return new Predicate[] {iPredicate1, iPredicate2};
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/AnyPredicate.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/AnyPredicate.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/AnyPredicate.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/AnyPredicate.java	2018-07-08 00:18:18.000000000 +0000
@@ -29,7 +29,6 @@
  * threw an exception.
  *
  * @since 3.0
- * @version $Id: AnyPredicate.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public final class AnyPredicate<T> extends AbstractQuantifierPredicate<T> {
 
@@ -57,7 +56,7 @@
         if (predicates.length == 1) {
             return (Predicate<T>) predicates[0];
         }
-        return new AnyPredicate<T>(FunctorUtils.copy(predicates));
+        return new AnyPredicate<>(FunctorUtils.copy(predicates));
     }
 
     /**
@@ -81,7 +80,7 @@
         if (preds.length == 1) {
             return (Predicate<T>) preds[0];
         }
-        return new AnyPredicate<T>(preds);
+        return new AnyPredicate<>(preds);
     }
 
     /**
@@ -100,6 +99,7 @@
      * @param object  the input object
      * @return true if any decorated predicate return true
      */
+    @Override
     public boolean evaluate(final T object) {
         for (final Predicate<? super T> iPredicate : iPredicates) {
             if (iPredicate.evaluate(object)) {
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/CatchAndRethrowClosure.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/CatchAndRethrowClosure.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/CatchAndRethrowClosure.java	2013-04-30 19:49:02.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/CatchAndRethrowClosure.java	2018-07-08 00:18:18.000000000 +0000
@@ -34,9 +34,9 @@
  * };
  *
  * // use catch and re-throw closure
- * java.util.List<String> strList = // some list
+ * java.util.List&lt;String&gt; strList = // some list
  * try {
- *     CollctionUtils.forAllDo(strList, writer);
+ *     CollectionUtils.forAllDo(strList, writer);
  * } catch (FunctorException ex) {
  *     Throwable originalError = ex.getCause();
  *     // handle error
@@ -44,7 +44,6 @@
  * </pre>
  *
  * @since 4.0
- * @version $Id: CatchAndRethrowClosure.java 1477798 2013-04-30 19:49:02Z tn $
  */
 public abstract class CatchAndRethrowClosure<E> implements Closure<E> {
 
@@ -55,6 +54,7 @@
      * @throws FunctorException (runtime) if the closure execution resulted in a
      *             checked exception.
      */
+    @Override
     public void execute(final E input) {
         try {
             executeAndThrow(input);
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/ChainedClosure.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/ChainedClosure.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/ChainedClosure.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/ChainedClosure.java	2018-07-08 00:18:18.000000000 +0000
@@ -25,7 +25,6 @@
  * Closure implementation that chains the specified closures together.
  *
  * @since 3.0
- * @version $Id: ChainedClosure.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class ChainedClosure<E> implements Closure<E>, Serializable {
 
@@ -49,7 +48,7 @@
         if (closures.length == 0) {
             return NOPClosure.<E>nopClosure();
         }
-        return new ChainedClosure<E>(closures);
+        return new ChainedClosure<>(closures);
     }
 
     /**
@@ -78,7 +77,7 @@
             cmds[i++] = closure;
         }
         FunctorUtils.validate(cmds);
-        return new ChainedClosure<E>(false, cmds);
+        return new ChainedClosure<>(false, cmds);
     }
 
     /**
@@ -107,6 +106,7 @@
      *
      * @param input  the input object passed to each closure
      */
+    @Override
     public void execute(final E input) {
         for (final Closure<? super E> iClosure : iClosures) {
             iClosure.execute(input);
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/ChainedTransformer.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/ChainedTransformer.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/ChainedTransformer.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/ChainedTransformer.java	2018-07-08 00:18:18.000000000 +0000
@@ -28,7 +28,6 @@
  * is passed to the second transformer and so on.
  *
  * @since 3.0
- * @version $Id: ChainedTransformer.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class ChainedTransformer<T> implements Transformer<T, T>, Serializable {
 
@@ -52,7 +51,7 @@
         if (transformers.length == 0) {
             return NOPTransformer.<T>nopTransformer();
         }
-        return new ChainedTransformer<T>(transformers);
+        return new ChainedTransformer<>(transformers);
     }
 
     /**
@@ -78,7 +77,7 @@
         // convert to array like this to guarantee iterator() ordering
         final Transformer<T, T>[] cmds = transformers.toArray(new Transformer[transformers.size()]);
         FunctorUtils.validate(cmds);
-        return new ChainedTransformer<T>(false, cmds);
+        return new ChainedTransformer<>(false, cmds);
     }
 
     /**
@@ -108,6 +107,7 @@
      * @param object  the input object passed to the first transformer
      * @return the transformed result
      */
+    @Override
     public T transform(T object) {
         for (final Transformer<? super T, ? extends T> iTransformer : iTransformers) {
             object = iTransformer.transform(object);
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/CloneTransformer.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/CloneTransformer.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/CloneTransformer.java	2015-11-13 20:08:45.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/CloneTransformer.java	2018-07-08 00:18:18.000000000 +0000
@@ -29,13 +29,12 @@
  * for more details.
  *
  * @since 3.0
- * @version $Id: CloneTransformer.java 1714262 2015-11-13 20:08:45Z tn $
  */
 public class CloneTransformer<T> implements Transformer<T, T> {
 
     /** Singleton predicate instance */
     @SuppressWarnings("rawtypes") // the singleton instance works for all types
-    public static final Transformer INSTANCE = new CloneTransformer<Object>();
+    public static final Transformer INSTANCE = new CloneTransformer<>();
 
     /**
      * Factory returning the singleton instance.
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/ClosureTransformer.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/ClosureTransformer.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/ClosureTransformer.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/ClosureTransformer.java	2018-07-08 00:18:18.000000000 +0000
@@ -26,7 +26,6 @@
  * and then returns the input.
  *
  * @since 3.0
- * @version $Id: ClosureTransformer.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class ClosureTransformer<T> implements Transformer<T, T>, Serializable {
 
@@ -48,7 +47,7 @@
         if (closure == null) {
             throw new NullPointerException("Closure must not be null");
         }
-        return new ClosureTransformer<T>(closure);
+        return new ClosureTransformer<>(closure);
     }
 
     /**
@@ -68,6 +67,7 @@
      * @param input  the input object to transform
      * @return the transformed result
      */
+    @Override
     public T transform(final T input) {
         iClosure.execute(input);
         return input;
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/ComparatorPredicate.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/ComparatorPredicate.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/ComparatorPredicate.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/ComparatorPredicate.java	2018-07-08 00:18:18.000000000 +0000
@@ -25,7 +25,7 @@
  * Predicate that compares the input object with the one stored in the predicate using a comparator.
  * In addition, the comparator result can be evaluated in accordance to a supplied criterion value.
  *
- * In order to demonstrate the use of the predicate, the following variables are declared:
+ * <p>In order to demonstrate the use of the predicate, the following variables are declared:</p>
  *
  * <pre>
  * Integer ONE = Integer.valueOf(1);
@@ -40,14 +40,14 @@
  * };
  * </pre>
  *
- * Using the declared variables, the <code>ComparatorPredicate</code> can be used used in the
- * following way:
+ * <p>Using the declared variables, the <code>ComparatorPredicate</code> can be used used in the
+ * following way:</p>
  *
  * <pre>
  * ComparatorPredicate.comparatorPredicate(ONE, comparator).evaluate(TWO);
  * </pre>
  *
- * The input variable <code>TWO</code> in compared to the stored variable <code>ONE</code> using
+ * <p>The input variable <code>TWO</code> in compared to the stored variable <code>ONE</code> using
  * the supplied <code>comparator</code>. This is the default usage of the predicate and will return
  * <code>true</code> if the underlying comparator returns <code>0</code>. In addition to the default
  * usage of the predicate, it is possible to evaluate the comparator's result in several ways. The
@@ -62,19 +62,18 @@
  *     <li>LESS_OR_EQUAL</li>
  * </ul>
  *
- * The following examples demonstrates how these constants can be used in order to manipulate the
- * evaluation of a comparator result.
+ * <p>The following examples demonstrates how these constants can be used in order to manipulate the
+ * evaluation of a comparator result.</p>
  *
  * <pre>
  * ComparatorPredicate.comparatorPredicate(ONE, comparator,<b>ComparatorPredicate.Criterion.GREATER</b>).evaluate(TWO);
  * </pre>
  *
- * The input variable TWO is compared to the stored variable ONE using the supplied <code>comparator</code>
+ * <p>The input variable TWO is compared to the stored variable ONE using the supplied <code>comparator</code>
  * using the <code>GREATER</code> evaluation criterion constant. This instructs the predicate to
- * return <code>true</code> if the comparator returns a value greater than <code>0</code>.
+ * return <code>true</code> if the comparator returns a value greater than <code>0</code>.</p>
  *
  * @since 4.0
- * @version $Id: ComparatorPredicate.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class ComparatorPredicate<T> implements Predicate<T>, Serializable {
 
@@ -126,7 +125,7 @@
         if (criterion == null) {
             throw new NullPointerException("Criterion must not be null.");
         }
-        return new ComparatorPredicate<T>(object, comparator, criterion);
+        return new ComparatorPredicate<>(object, comparator, criterion);
     }
 
     /**
@@ -148,11 +147,11 @@
      * Evaluates the predicate. The predicate evaluates to <code>true</code> in the following cases:
      *
      * <ul>
-     *     <li><code>comparator.compare(object, input) == 0 && criterion == EQUAL</code></li>
-     *     <li><code>comparator.compare(object, input) < 0 && criterion == LESS</code></li>
-     *     <li><code>comparator.compare(object, input) > 0 && criterion == GREATER</code></li>
-     *     <li><code>comparator.compare(object, input) >= 0 && criterion == GREATER_OR_EQUAL</code></li>
-     *     <li><code>comparator.compare(object, input) <= 0 && criterion == LESS_OR_EQUAL</code></li>
+     * <li><code>comparator.compare(object, input) == 0 &amp;&amp; criterion == EQUAL</code></li>
+     * <li><code>comparator.compare(object, input) &lt; 0 &amp;&amp; criterion == LESS</code></li>
+     * <li><code>comparator.compare(object, input) &gt; 0 &amp;&amp; criterion == GREATER</code></li>
+     * <li><code>comparator.compare(object, input) &gt;= 0 &amp;&amp; criterion == GREATER_OR_EQUAL</code></li>
+     * <li><code>comparator.compare(object, input) &lt;= 0 &amp;&amp; criterion == LESS_OR_EQUAL</code></li>
      * </ul>
      *
      * @see org.apache.commons.collections4.Predicate#evaluate(java.lang.Object)
@@ -162,6 +161,7 @@
      * @return {@code true} if the comparison succeeds according to the selected criterion
      * @throws IllegalStateException if the criterion is invalid (really not possible)
      */
+    @Override
     public boolean evaluate(final T target) {
 
         boolean result = false;
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/ConstantFactory.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/ConstantFactory.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/ConstantFactory.java	2013-11-20 21:13:35.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/ConstantFactory.java	2018-07-08 00:18:18.000000000 +0000
@@ -28,7 +28,6 @@
  * use the prototype factory.
  *
  * @since 3.0
- * @version $Id: ConstantFactory.java 1543950 2013-11-20 21:13:35Z tn $
  */
 public class ConstantFactory<T> implements Factory<T>, Serializable {
 
@@ -37,7 +36,7 @@
 
     /** Returns null each time */
     @SuppressWarnings("rawtypes") // The null factory works for all object types
-    public static final Factory NULL_INSTANCE = new ConstantFactory<Object>(null);
+    public static final Factory NULL_INSTANCE = new ConstantFactory<>(null);
 
     /** The closures to call in turn */
     private final T iConstant;
@@ -52,9 +51,9 @@
     @SuppressWarnings("unchecked") // The null factory works for all object types
     public static <T> Factory<T> constantFactory(final T constantToReturn) {
         if (constantToReturn == null) {
-            return (Factory<T>) NULL_INSTANCE;
+            return NULL_INSTANCE;
         }
-        return new ConstantFactory<T>(constantToReturn);
+        return new ConstantFactory<>(constantToReturn);
     }
 
     /**
@@ -73,6 +72,7 @@
      *
      * @return the stored constant value
      */
+    @Override
     public T create() {
         return iConstant;
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/ConstantTransformer.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/ConstantTransformer.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/ConstantTransformer.java	2013-11-20 21:13:35.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/ConstantTransformer.java	2018-07-08 00:18:18.000000000 +0000
@@ -28,7 +28,6 @@
  * use the prototype factory.
  *
  * @since 3.0
- * @version $Id: ConstantTransformer.java 1543950 2013-11-20 21:13:35Z tn $
  */
 public class ConstantTransformer<I, O> implements Transformer<I, O>, Serializable {
 
@@ -37,7 +36,7 @@
 
     /** Returns null each time */
     @SuppressWarnings("rawtypes")
-    public static final Transformer NULL_INSTANCE = new ConstantTransformer<Object, Object>(null);
+    public static final Transformer NULL_INSTANCE = new ConstantTransformer<>(null);
 
     /** The closures to call in turn */
     private final O iConstant;
@@ -47,11 +46,11 @@
      *
      * @param <I>  the input type
      * @param <O>  the output type
-     * @return Transformer<I, O> that always returns null.
+     * @return Transformer&lt;I, O&gt; that always returns null.
      */
     @SuppressWarnings("unchecked") // The null transformer works for all object types
     public static <I, O> Transformer<I, O> nullTransformer() {
-        return (Transformer<I, O>) NULL_INSTANCE;
+        return NULL_INSTANCE;
     }
 
     /**
@@ -66,7 +65,7 @@
         if (constantToReturn == null) {
             return nullTransformer();
         }
-        return new ConstantTransformer<I, O>(constantToReturn);
+        return new ConstantTransformer<>(constantToReturn);
     }
 
     /**
@@ -86,6 +85,7 @@
      * @param input  the input object which is ignored
      * @return the stored constant
      */
+    @Override
     public O transform(final I input) {
         return iConstant;
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/DefaultEquator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/DefaultEquator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/DefaultEquator.java	2013-11-20 21:13:35.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/DefaultEquator.java	2018-07-08 00:18:18.000000000 +0000
@@ -25,7 +25,6 @@
  *
  * @param <T>  the types of object this {@link Equator} can evaluate.
  * @since 4.0
- * @version $Id: DefaultEquator.java 1543950 2013-11-20 21:13:35Z tn $
  */
 public class DefaultEquator<T> implements Equator<T>, Serializable {
 
@@ -34,7 +33,7 @@
 
     /** Static instance */
     @SuppressWarnings("rawtypes") // the static instance works for all types
-    public static final DefaultEquator INSTANCE = new DefaultEquator<Object>();
+    public static final DefaultEquator INSTANCE = new DefaultEquator<>();
 
     /**
      * Hashcode used for <code>null</code> objects.
@@ -49,7 +48,7 @@
      */
     @SuppressWarnings("unchecked") // the static instance works for all types
     public static <T> DefaultEquator<T> defaultEquator() {
-        return (DefaultEquator<T>) DefaultEquator.INSTANCE;
+        return DefaultEquator.INSTANCE;
     }
 
     /**
@@ -62,6 +61,7 @@
     /**
      * {@inheritDoc} Delegates to {@link Object#equals(Object)}.
      */
+    @Override
     public boolean equate(final T o1, final T o2) {
         return o1 == o2 || o1 != null && o1.equals(o2);
     }
@@ -72,6 +72,7 @@
      * @return <code>o.hashCode()</code> if <code>o</code> is non-
      *         <code>null</code>, else {@link #HASHCODE_NULL}.
      */
+    @Override
     public int hash(final T o) {
         return o == null ? HASHCODE_NULL : o.hashCode();
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/EqualPredicate.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/EqualPredicate.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/EqualPredicate.java	2015-06-04 15:23:56.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/EqualPredicate.java	2018-07-08 00:18:18.000000000 +0000
@@ -26,7 +26,6 @@
  * as the one stored in this predicate by equals.
  *
  * @since 3.0
- * @version $Id: EqualPredicate.java 1683576 2015-06-04 15:23:56Z tn $
  */
 public final class EqualPredicate<T> implements Predicate<T>, Serializable {
 
@@ -50,7 +49,7 @@
         if (object == null) {
             return NullPredicate.nullPredicate();
         }
-        return new EqualPredicate<T>(object);
+        return new EqualPredicate<>(object);
     }
 
     /**
@@ -66,7 +65,7 @@
         if (object == null) {
             return NullPredicate.nullPredicate();
         }
-        return new EqualPredicate<T>(object, equator);
+        return new EqualPredicate<>(object, equator);
     }
 
     /**
@@ -101,12 +100,12 @@
      * @param object  the input object
      * @return true if input object equals stored value
      */
+    @Override
     public boolean evaluate(final T object) {
         if (equator != null) {
             return equator.equate(iValue, object);
-        } else {
-            return iValue.equals(object);
         }
+        return iValue.equals(object);
     }
 
     /**
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/ExceptionClosure.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/ExceptionClosure.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/ExceptionClosure.java	2013-11-20 21:13:35.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/ExceptionClosure.java	2018-07-08 00:18:18.000000000 +0000
@@ -25,7 +25,6 @@
  * Closure implementation that always throws an exception.
  *
  * @since 3.0
- * @version $Id: ExceptionClosure.java 1543950 2013-11-20 21:13:35Z tn $
  */
 public final class ExceptionClosure<E> implements Closure<E>, Serializable {
 
@@ -34,7 +33,7 @@
 
     /** Singleton predicate instance */
     @SuppressWarnings("rawtypes") // the static instance works for all types
-    public static final Closure INSTANCE = new ExceptionClosure<Object>();
+    public static final Closure INSTANCE = new ExceptionClosure<>();
 
     /**
      * Factory returning the singleton instance.
@@ -45,7 +44,7 @@
      */
     @SuppressWarnings("unchecked")  // the static instance works for all types
     public static <E> Closure<E> exceptionClosure() {
-        return (Closure<E>) INSTANCE;
+        return INSTANCE;
     }
 
     /**
@@ -61,6 +60,7 @@
      * @param input  the input object
      * @throws FunctorException always
      */
+    @Override
     public void execute(final E input) {
         throw new FunctorException("ExceptionClosure invoked");
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/ExceptionFactory.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/ExceptionFactory.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/ExceptionFactory.java	2013-11-20 21:13:35.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/ExceptionFactory.java	2018-07-08 00:18:18.000000000 +0000
@@ -25,7 +25,6 @@
  * Factory implementation that always throws an exception.
  *
  * @since 3.0
- * @version $Id: ExceptionFactory.java 1543950 2013-11-20 21:13:35Z tn $
  */
 public final class ExceptionFactory<T> implements Factory<T>, Serializable {
 
@@ -34,7 +33,7 @@
 
     /** Singleton predicate instance */
     @SuppressWarnings("rawtypes") // the static instance works for all types
-    public static final Factory INSTANCE = new ExceptionFactory<Object>();
+    public static final Factory INSTANCE = new ExceptionFactory<>();
 
     /**
      * Factory returning the singleton instance.
@@ -45,7 +44,7 @@
      */
     @SuppressWarnings("unchecked") // the static instance works for all types
     public static <T> Factory<T> exceptionFactory() {
-        return (Factory<T>) INSTANCE;
+        return INSTANCE;
     }
 
     /**
@@ -61,6 +60,7 @@
      * @return never
      * @throws FunctorException always
      */
+    @Override
     public T create() {
         throw new FunctorException("ExceptionFactory invoked");
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/ExceptionPredicate.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/ExceptionPredicate.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/ExceptionPredicate.java	2013-11-20 21:13:35.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/ExceptionPredicate.java	2018-07-08 00:18:18.000000000 +0000
@@ -25,7 +25,6 @@
  * Predicate implementation that always throws an exception.
  *
  * @since 3.0
- * @version $Id: ExceptionPredicate.java 1543950 2013-11-20 21:13:35Z tn $
  */
 public final class ExceptionPredicate<T> implements Predicate<T>, Serializable {
 
@@ -34,7 +33,7 @@
 
     /** Singleton predicate instance */
     @SuppressWarnings("rawtypes") // the static instance works for all types
-    public static final Predicate INSTANCE = new ExceptionPredicate<Object>();
+    public static final Predicate INSTANCE = new ExceptionPredicate<>();
 
     /**
      * Factory returning the singleton instance.
@@ -45,7 +44,7 @@
      */
     @SuppressWarnings("unchecked") // the static instance works for all types
     public static <T> Predicate<T> exceptionPredicate() {
-        return (Predicate<T>) INSTANCE;
+        return INSTANCE;
     }
 
     /**
@@ -62,6 +61,7 @@
      * @return never
      * @throws FunctorException always
      */
+    @Override
     public boolean evaluate(final T object) {
         throw new FunctorException("ExceptionPredicate invoked");
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/ExceptionTransformer.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/ExceptionTransformer.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/ExceptionTransformer.java	2013-11-20 21:13:35.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/ExceptionTransformer.java	2018-07-08 00:18:18.000000000 +0000
@@ -25,7 +25,6 @@
  * Transformer implementation that always throws an exception.
  *
  * @since 3.0
- * @version $Id: ExceptionTransformer.java 1543950 2013-11-20 21:13:35Z tn $
  */
 public final class ExceptionTransformer<I, O> implements Transformer<I, O>, Serializable {
 
@@ -34,7 +33,7 @@
 
     /** Singleton predicate instance */
     @SuppressWarnings("rawtypes") // the static instance works for all types
-    public static final Transformer INSTANCE = new ExceptionTransformer<Object, Object>();
+    public static final Transformer INSTANCE = new ExceptionTransformer<>();
 
     /**
      * Factory returning the singleton instance.
@@ -46,7 +45,7 @@
      */
     @SuppressWarnings("unchecked") // the static instance works for all types
     public static <I, O> Transformer<I, O> exceptionTransformer() {
-        return (Transformer<I, O>) INSTANCE;
+        return INSTANCE;
     }
 
     /**
@@ -63,6 +62,7 @@
      * @return never
      * @throws FunctorException always
      */
+    @Override
     public O transform(final I input) {
         throw new FunctorException("ExceptionTransformer invoked");
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/FactoryTransformer.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/FactoryTransformer.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/FactoryTransformer.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/FactoryTransformer.java	2018-07-08 00:18:18.000000000 +0000
@@ -25,7 +25,6 @@
  * Transformer implementation that calls a Factory and returns the result.
  *
  * @since 3.0
- * @version $Id: FactoryTransformer.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class FactoryTransformer<I, O> implements Transformer<I, O>, Serializable {
 
@@ -48,7 +47,7 @@
         if (factory == null) {
             throw new NullPointerException("Factory must not be null");
         }
-        return new FactoryTransformer<I, O>(factory);
+        return new FactoryTransformer<>(factory);
     }
 
     /**
@@ -69,6 +68,7 @@
      * @param input  the input object to transform
      * @return the transformed result
      */
+    @Override
     public O transform(final I input) {
         return iFactory.create();
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/FalsePredicate.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/FalsePredicate.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/FalsePredicate.java	2013-11-20 21:13:35.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/FalsePredicate.java	2018-07-08 00:18:18.000000000 +0000
@@ -24,7 +24,6 @@
  * Predicate implementation that always returns false.
  *
  * @since 3.0
- * @version $Id: FalsePredicate.java 1543950 2013-11-20 21:13:35Z tn $
  */
 public final class FalsePredicate<T> implements Predicate<T>, Serializable {
 
@@ -33,7 +32,7 @@
 
     /** Singleton predicate instance */
     @SuppressWarnings("rawtypes") // the static instance works for all types
-    public static final Predicate INSTANCE = new FalsePredicate<Object>();
+    public static final Predicate INSTANCE = new FalsePredicate<>();
 
     /**
      * Get a typed instance.
@@ -44,7 +43,7 @@
      */
     @SuppressWarnings("unchecked") // the static instance works for all types
     public static <T> Predicate<T> falsePredicate() {
-        return (Predicate<T>) INSTANCE;
+        return INSTANCE;
     }
 
     /**
@@ -60,6 +59,7 @@
      * @param object  the input object
      * @return false always
      */
+    @Override
     public boolean evaluate(final T object) {
         return false;
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/ForClosure.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/ForClosure.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/ForClosure.java	2015-11-13 20:08:45.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/ForClosure.java	2018-07-08 00:18:18.000000000 +0000
@@ -27,7 +27,6 @@
  * for more details.
  *
  * @since 3.0
- * @version $Id: ForClosure.java 1714262 2015-11-13 20:08:45Z tn $
  */
 public class ForClosure<E> implements Closure<E> {
 
@@ -55,7 +54,7 @@
         if (count == 1) {
             return (Closure<E>) closure;
         }
-        return new ForClosure<E>(count, closure);
+        return new ForClosure<>(count, closure);
     }
 
     /**
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/FunctorUtils.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/FunctorUtils.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/FunctorUtils.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/FunctorUtils.java	2018-07-08 00:18:18.000000000 +0000
@@ -26,7 +26,6 @@
  * Internal utilities for functors.
  *
  * @since 3.0
- * @version $Id: FunctorUtils.java 1686855 2015-06-22 13:00:27Z tn $
  */
 class FunctorUtils {
 
@@ -195,7 +194,8 @@
      * simply as centralised documentation and atomic unchecked warning
      * suppression.
      *
-     * @param <T> the type of object the returned transformer should "accept"
+     * @param <I> the type of object the returned transformer should "accept"
+     * @param <O> the type of object the returned transformer should "produce"
      * @param transformer the transformer to coerce.
      * @return the coerced transformer.
      */
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/IdentityPredicate.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/IdentityPredicate.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/IdentityPredicate.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/IdentityPredicate.java	2018-07-08 00:18:18.000000000 +0000
@@ -25,7 +25,6 @@
  * as the one stored in this predicate.
  *
  * @since 3.0
- * @version $Id: IdentityPredicate.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public final class IdentityPredicate<T> implements Predicate<T>, Serializable {
 
@@ -46,7 +45,7 @@
         if (object == null) {
             return NullPredicate.<T>nullPredicate();
         }
-        return new IdentityPredicate<T>(object);
+        return new IdentityPredicate<>(object);
     }
 
     /**
@@ -67,6 +66,7 @@
      * @param object  the input object
      * @return true if input is the same object as the stored value
      */
+    @Override
     public boolean evaluate(final T object) {
         return iValue == object;
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/IfClosure.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/IfClosure.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/IfClosure.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/IfClosure.java	2018-07-08 00:18:18.000000000 +0000
@@ -26,7 +26,6 @@
  * based on a predicate.
  *
  * @since 3.0
- * @version $Id: IfClosure.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class IfClosure<E> implements Closure<E>, Serializable {
 
@@ -76,7 +75,7 @@
         if (trueClosure == null || falseClosure == null) {
             throw new NullPointerException("Closures must not be null");
         }
-        return new IfClosure<E>(predicate, trueClosure, falseClosure);
+        return new IfClosure<>(predicate, trueClosure, falseClosure);
     }
 
     /**
@@ -115,6 +114,7 @@
      *
      * @param input  the input object
      */
+    @Override
     public void execute(final E input) {
         if (iPredicate.evaluate(input)) {
             iTrueClosure.execute(input);
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/IfTransformer.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/IfTransformer.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/IfTransformer.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/IfTransformer.java	2018-07-08 00:18:18.000000000 +0000
@@ -29,7 +29,6 @@
  * @param <O> The output type for the transformer
  *
  * @since 4.1
- * @version $Id: IfTransformer.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class IfTransformer<I, O> implements Transformer<I, O>, Serializable {
 
@@ -64,7 +63,7 @@
             throw new NullPointerException("Transformers must not be null");
         }
 
-        return new IfTransformer<I, O>(predicate, trueTransformer, falseTransformer);
+        return new IfTransformer<>(predicate, trueTransformer, falseTransformer);
     }
 
     /**
@@ -90,7 +89,7 @@
             throw new NullPointerException("Transformer must not be null");
         }
 
-        return new IfTransformer<T, T>(predicate, trueTransformer, NOPTransformer.<T>nopTransformer());
+        return new IfTransformer<>(predicate, trueTransformer, NOPTransformer.<T>nopTransformer());
     }
 
     /**
@@ -117,12 +116,12 @@
      * @param input  the input object to transform
      * @return the transformed result
      */
+    @Override
     public O transform(final I input) {
         if(iPredicate.evaluate(input)){
             return iTrueTransformer.transform(input);
-        } else {
-            return iFalseTransformer.transform(input);
         }
+        return iFalseTransformer.transform(input);
     }
 
     /**
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/InstanceofPredicate.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/InstanceofPredicate.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/InstanceofPredicate.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/InstanceofPredicate.java	2018-07-08 00:18:18.000000000 +0000
@@ -25,7 +25,6 @@
  * the type stored in this predicate.
  *
  * @since 3.0
- * @version $Id: InstanceofPredicate.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public final class InstanceofPredicate implements Predicate<Object>, Serializable {
 
@@ -66,6 +65,7 @@
      * @param object  the input object
      * @return true if input is of stored type
      */
+    @Override
     public boolean evaluate(final Object object) {
         return iType.isInstance(object);
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/InstantiateFactory.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/InstantiateFactory.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/InstantiateFactory.java	2015-11-13 20:08:45.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/InstantiateFactory.java	2018-07-08 00:18:18.000000000 +0000
@@ -31,7 +31,6 @@
  * for more details.
  *
  * @since 3.0
- * @version $Id: InstantiateFactory.java 1714262 2015-11-13 20:08:45Z tn $
  */
 public class InstantiateFactory<T> implements Factory<T> {
 
@@ -68,9 +67,9 @@
         }
 
         if (paramTypes == null || paramTypes.length == 0) {
-            return new InstantiateFactory<T>(classToInstantiate);
+            return new InstantiateFactory<>(classToInstantiate);
         }
-        return new InstantiateFactory<T>(classToInstantiate, paramTypes, args);
+        return new InstantiateFactory<>(classToInstantiate, paramTypes, args);
     }
 
     /**
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/InstantiateTransformer.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/InstantiateTransformer.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/InstantiateTransformer.java	2015-11-13 20:08:45.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/InstantiateTransformer.java	2018-07-08 00:18:18.000000000 +0000
@@ -31,13 +31,12 @@
  * for more details.
  *
  * @since 3.0
- * @version $Id: InstantiateTransformer.java 1714262 2015-11-13 20:08:45Z tn $
  */
 public class InstantiateTransformer<T> implements Transformer<Class<? extends T>, T> {
 
     /** Singleton instance that uses the no arg constructor */
     @SuppressWarnings("rawtypes")
-    private static final Transformer NO_ARG_INSTANCE = new InstantiateTransformer<Object>();
+    private static final Transformer NO_ARG_INSTANCE = new InstantiateTransformer<>();
 
     /** The constructor parameter types */
     private final Class<?>[] iParamTypes;
@@ -48,7 +47,7 @@
      * Get a typed no-arg instance.
      *
      * @param <T>  the type of the objects to be created
-     * @return Transformer<Class<? extends T>, T>
+     * @return Transformer&lt;Class&lt;? extends T&gt;, T&gt;
      */
     @SuppressWarnings("unchecked")
     public static <T> Transformer<Class<? extends T>, T> instantiateTransformer() {
@@ -73,9 +72,9 @@
         }
 
         if (paramTypes == null || paramTypes.length == 0) {
-            return new InstantiateTransformer<T>();
+            return new InstantiateTransformer<>();
         }
-        return new InstantiateTransformer<T>(paramTypes, args);
+        return new InstantiateTransformer<>(paramTypes, args);
     }
 
     /**
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/InvokerTransformer.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/InvokerTransformer.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/InvokerTransformer.java	2015-11-13 20:08:45.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/InvokerTransformer.java	2018-07-08 00:18:18.000000000 +0000
@@ -31,7 +31,6 @@
  * for more details.
  *
  * @since 3.0
- * @version $Id: InvokerTransformer.java 1714262 2015-11-13 20:08:45Z tn $
  */
 public class InvokerTransformer<I, O> implements Transformer<I, O> {
 
@@ -56,7 +55,7 @@
         if (methodName == null) {
             throw new NullPointerException("The method to invoke must not be null");
         }
-        return new InvokerTransformer<I, O>(methodName);
+        return new InvokerTransformer<>(methodName);
     }
 
     /**
@@ -82,9 +81,9 @@
             throw new IllegalArgumentException("The parameter types must match the arguments");
         }
         if (paramTypes == null || paramTypes.length == 0) {
-            return new InvokerTransformer<I, O>(methodName);
+            return new InvokerTransformer<>(methodName);
         }
-        return new InvokerTransformer<I, O>(methodName, paramTypes, args);
+        return new InvokerTransformer<>(methodName, paramTypes, args);
     }
 
     /**
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/MapTransformer.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/MapTransformer.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/MapTransformer.java	2013-04-27 14:13:54.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/MapTransformer.java	2018-07-08 00:18:18.000000000 +0000
@@ -26,7 +26,6 @@
  * using the input parameter as a key.
  *
  * @since 3.0
- * @version $Id: MapTransformer.java 1476582 2013-04-27 14:13:54Z tn $
  */
 public final class MapTransformer<I, O> implements Transformer<I, O>, Serializable {
 
@@ -50,7 +49,7 @@
         if (map == null) {
             return ConstantTransformer.<I, O>nullTransformer();
         }
-        return new MapTransformer<I, O>(map);
+        return new MapTransformer<>(map);
     }
 
     /**
@@ -70,6 +69,7 @@
      * @param input  the input object to transform
      * @return the transformed result
      */
+    @Override
     public O transform(final I input) {
         return iMap.get(input);
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/NonePredicate.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/NonePredicate.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/NonePredicate.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/NonePredicate.java	2018-07-08 00:18:18.000000000 +0000
@@ -29,7 +29,6 @@
  * threw an exception.
  *
  * @since 3.0
- * @version $Id: NonePredicate.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public final class NonePredicate<T> extends AbstractQuantifierPredicate<T> {
 
@@ -52,7 +51,7 @@
         if (predicates.length == 0) {
             return TruePredicate.<T>truePredicate();
         }
-        return new NonePredicate<T>(FunctorUtils.copy(predicates));
+        return new NonePredicate<>(FunctorUtils.copy(predicates));
     }
 
     /**
@@ -71,7 +70,7 @@
         if (preds.length == 0) {
             return TruePredicate.<T>truePredicate();
         }
-        return new NonePredicate<T>(preds);
+        return new NonePredicate<>(preds);
     }
 
     /**
@@ -90,6 +89,7 @@
      * @param object  the input object
      * @return true if none of decorated predicates return true
      */
+    @Override
     public boolean evaluate(final T object) {
         for (final Predicate<? super T> iPredicate : iPredicates) {
             if (iPredicate.evaluate(object)) {
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/NOPClosure.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/NOPClosure.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/NOPClosure.java	2013-11-20 21:13:35.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/NOPClosure.java	2018-07-08 00:18:18.000000000 +0000
@@ -24,7 +24,6 @@
  * Closure implementation that does nothing.
  *
  * @since 3.0
- * @version $Id: NOPClosure.java 1543950 2013-11-20 21:13:35Z tn $
  */
 public final class NOPClosure<E> implements Closure<E>, Serializable {
 
@@ -33,7 +32,7 @@
 
     /** Singleton predicate instance */
     @SuppressWarnings("rawtypes")
-    public static final Closure INSTANCE = new NOPClosure<Object>();
+    public static final Closure INSTANCE = new NOPClosure<>();
 
     /**
      * Factory returning the singleton instance.
@@ -44,7 +43,7 @@
      */
     @SuppressWarnings("unchecked")
     public static <E> Closure<E> nopClosure() {
-        return (Closure<E>) INSTANCE;
+        return INSTANCE;
     }
 
     /**
@@ -59,6 +58,7 @@
      *
      * @param input  the input object
      */
+    @Override
     public void execute(final E input) {
         // do nothing
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/NOPTransformer.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/NOPTransformer.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/NOPTransformer.java	2013-11-20 21:13:35.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/NOPTransformer.java	2018-07-08 00:18:18.000000000 +0000
@@ -24,7 +24,6 @@
  * Transformer implementation that does nothing.
  *
  * @since 3.0
- * @version $Id: NOPTransformer.java 1543950 2013-11-20 21:13:35Z tn $
  */
 public class NOPTransformer<T> implements Transformer<T, T>, Serializable {
 
@@ -33,7 +32,7 @@
 
     /** Singleton predicate instance */
     @SuppressWarnings("rawtypes")
-    public static final Transformer INSTANCE = new NOPTransformer<Object>();
+    public static final Transformer INSTANCE = new NOPTransformer<>();
 
     /**
      * Factory returning the singleton instance.
@@ -44,7 +43,7 @@
      */
     @SuppressWarnings("unchecked")
     public static <T> Transformer<T, T> nopTransformer() {
-        return (Transformer<T, T>) INSTANCE;
+        return INSTANCE;
     }
 
     /**
@@ -60,6 +59,7 @@
      * @param input  the input object to transform
      * @return the transformed result which is the input
      */
+    @Override
     public T transform(final T input) {
         return input;
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/NotNullPredicate.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/NotNullPredicate.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/NotNullPredicate.java	2013-11-20 21:13:35.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/NotNullPredicate.java	2018-07-08 00:18:18.000000000 +0000
@@ -24,7 +24,6 @@
  * Predicate implementation that returns true if the input is not null.
  *
  * @since 3.0
- * @version $Id: NotNullPredicate.java 1543950 2013-11-20 21:13:35Z tn $
  */
 public final class NotNullPredicate<T> implements Predicate<T>, Serializable {
 
@@ -33,7 +32,7 @@
 
     /** Singleton predicate instance */
     @SuppressWarnings("rawtypes")
-    public static final Predicate INSTANCE = new NotNullPredicate<Object>();
+    public static final Predicate INSTANCE = new NotNullPredicate<>();
 
     /**
      * Factory returning the singleton instance.
@@ -44,7 +43,7 @@
      */
     @SuppressWarnings("unchecked")
     public static <T> Predicate<T> notNullPredicate() {
-        return (Predicate<T>) INSTANCE;
+        return INSTANCE;
     }
 
     /**
@@ -60,6 +59,7 @@
      * @param object  the object to evaluate
      * @return true if not null
      */
+    @Override
     public boolean evaluate(final T object) {
         return object != null;
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/NotPredicate.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/NotPredicate.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/NotPredicate.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/NotPredicate.java	2018-07-08 00:18:18.000000000 +0000
@@ -24,7 +24,6 @@
  * Predicate implementation that returns the opposite of the decorated predicate.
  *
  * @since 3.0
- * @version $Id: NotPredicate.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public final class NotPredicate<T> implements PredicateDecorator<T>, Serializable {
 
@@ -46,7 +45,7 @@
         if (predicate == null) {
             throw new NullPointerException("Predicate must not be null");
         }
-        return new NotPredicate<T>(predicate);
+        return new NotPredicate<>(predicate);
     }
 
     /**
@@ -66,6 +65,7 @@
      * @param object  the input object
      * @return true if predicate returns false
      */
+    @Override
     public boolean evaluate(final T object) {
         return !iPredicate.evaluate(object);
     }
@@ -76,6 +76,7 @@
      * @return the predicate as the only element in an array
      * @since 3.1
      */
+    @Override
     @SuppressWarnings("unchecked")
     public Predicate<? super T>[] getPredicates() {
         return new Predicate[] {iPredicate};
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/NullIsExceptionPredicate.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/NullIsExceptionPredicate.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/NullIsExceptionPredicate.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/NullIsExceptionPredicate.java	2018-07-08 00:18:18.000000000 +0000
@@ -25,7 +25,6 @@
  * Predicate implementation that throws an exception if the input is null.
  *
  * @since 3.0
- * @version $Id: NullIsExceptionPredicate.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public final class NullIsExceptionPredicate<T> implements PredicateDecorator<T>, Serializable {
 
@@ -47,7 +46,7 @@
         if (predicate == null) {
             throw new NullPointerException("Predicate must not be null");
         }
-        return new NullIsExceptionPredicate<T>(predicate);
+        return new NullIsExceptionPredicate<>(predicate);
     }
 
     /**
@@ -69,6 +68,7 @@
      * @return true if decorated predicate returns true
      * @throws FunctorException if input is null
      */
+    @Override
     public boolean evaluate(final T object) {
         if (object == null) {
             throw new FunctorException("Input Object must not be null");
@@ -82,6 +82,7 @@
      * @return the predicate as the only element in an array
      * @since 3.1
      */
+    @Override
     @SuppressWarnings("unchecked")
     public Predicate<? super T>[] getPredicates() {
         return new Predicate[] { iPredicate };
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/NullIsFalsePredicate.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/NullIsFalsePredicate.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/NullIsFalsePredicate.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/NullIsFalsePredicate.java	2018-07-08 00:18:18.000000000 +0000
@@ -24,7 +24,6 @@
  * Predicate implementation that returns false if the input is null.
  *
  * @since 3.0
- * @version $Id: NullIsFalsePredicate.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public final class NullIsFalsePredicate<T> implements PredicateDecorator<T>, Serializable {
 
@@ -46,7 +45,7 @@
         if (predicate == null) {
             throw new NullPointerException("Predicate must not be null");
         }
-        return new NullIsFalsePredicate<T>(predicate);
+        return new NullIsFalsePredicate<>(predicate);
     }
 
     /**
@@ -67,6 +66,7 @@
      * @param object  the input object
      * @return true if decorated predicate returns true, false if input is null
      */
+    @Override
     public boolean evaluate(final T object) {
         if (object == null) {
             return false;
@@ -80,6 +80,7 @@
      * @return the predicate as the only element in an array
      * @since 3.1
      */
+    @Override
     @SuppressWarnings("unchecked")
     public Predicate<? super T>[] getPredicates() {
         return new Predicate[] { iPredicate };
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/NullIsTruePredicate.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/NullIsTruePredicate.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/NullIsTruePredicate.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/NullIsTruePredicate.java	2018-07-08 00:18:18.000000000 +0000
@@ -24,7 +24,6 @@
  * Predicate implementation that returns true if the input is null.
  *
  * @since 3.0
- * @version $Id: NullIsTruePredicate.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public final class NullIsTruePredicate<T> implements PredicateDecorator<T>, Serializable {
 
@@ -46,7 +45,7 @@
         if (predicate == null) {
             throw new NullPointerException("Predicate must not be null");
         }
-        return new NullIsTruePredicate<T>(predicate);
+        return new NullIsTruePredicate<>(predicate);
     }
 
     /**
@@ -67,6 +66,7 @@
      * @param object  the input object
      * @return true if decorated predicate returns true or input is null
      */
+    @Override
     public boolean evaluate(final T object) {
         if (object == null) {
             return true;
@@ -80,6 +80,7 @@
      * @return the predicate as the only element in an array
      * @since 3.1
      */
+    @Override
     @SuppressWarnings("unchecked")
     public Predicate<? super T>[] getPredicates() {
         return new Predicate[] { iPredicate };
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/NullPredicate.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/NullPredicate.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/NullPredicate.java	2013-11-20 21:13:35.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/NullPredicate.java	2018-07-08 00:18:18.000000000 +0000
@@ -24,7 +24,6 @@
  * Predicate implementation that returns true if the input is null.
  *
  * @since 3.0
- * @version $Id: NullPredicate.java 1543950 2013-11-20 21:13:35Z tn $
  */
 public final class NullPredicate<T> implements Predicate<T>, Serializable {
 
@@ -33,7 +32,7 @@
 
     /** Singleton predicate instance */
     @SuppressWarnings("rawtypes")
-    public static final Predicate INSTANCE = new NullPredicate<Object>();
+    public static final Predicate INSTANCE = new NullPredicate<>();
 
     /**
      * Factory returning the singleton instance.
@@ -44,7 +43,7 @@
      */
     @SuppressWarnings("unchecked")
     public static <T> Predicate<T> nullPredicate() {
-        return (Predicate<T>) INSTANCE;
+        return INSTANCE;
     }
 
     /**
@@ -60,6 +59,7 @@
      * @param object  the input object
      * @return true if input is null
      */
+    @Override
     public boolean evaluate(final T object) {
         return object == null;
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/OnePredicate.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/OnePredicate.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/OnePredicate.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/OnePredicate.java	2018-07-08 00:18:18.000000000 +0000
@@ -29,7 +29,6 @@
  * threw an exception.
  *
  * @since 3.0
- * @version $Id: OnePredicate.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public final class OnePredicate<T> extends AbstractQuantifierPredicate<T> {
 
@@ -57,7 +56,7 @@
         if (predicates.length == 1) {
             return (Predicate<T>) predicates[0];
         }
-        return new OnePredicate<T>(FunctorUtils.copy(predicates));
+        return new OnePredicate<>(FunctorUtils.copy(predicates));
     }
 
     /**
@@ -71,7 +70,7 @@
      */
     public static <T> Predicate<T> onePredicate(final Collection<? extends Predicate<? super T>> predicates) {
         final Predicate<? super T>[] preds = FunctorUtils.validate(predicates);
-        return new OnePredicate<T>(preds);
+        return new OnePredicate<>(preds);
     }
 
     /**
@@ -91,6 +90,7 @@
      * @param object  the input object
      * @return true if only one decorated predicate returns true
      */
+    @Override
     public boolean evaluate(final T object) {
         boolean match = false;
         for (final Predicate<? super T> iPredicate : iPredicates) {
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/OrPredicate.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/OrPredicate.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/OrPredicate.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/OrPredicate.java	2018-07-08 00:18:18.000000000 +0000
@@ -24,7 +24,6 @@
  * Predicate implementation that returns true if either of the predicates return true.
  *
  * @since 3.0
- * @version $Id: OrPredicate.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public final class OrPredicate<T> implements PredicateDecorator<T>, Serializable {
 
@@ -50,7 +49,7 @@
         if (predicate1 == null || predicate2 == null) {
             throw new NullPointerException("Predicate must not be null");
         }
-        return new OrPredicate<T>(predicate1, predicate2);
+        return new OrPredicate<>(predicate1, predicate2);
     }
 
     /**
@@ -72,6 +71,7 @@
      * @param object  the input object
      * @return true if either decorated predicate returns true
      */
+    @Override
     public boolean evaluate(final T object) {
        return iPredicate1.evaluate(object) || iPredicate2.evaluate(object);
     }
@@ -82,6 +82,7 @@
      * @return the predicates
      * @since 3.1
      */
+    @Override
     @SuppressWarnings("unchecked")
     public Predicate<? super T>[] getPredicates() {
         return new Predicate[] {iPredicate1, iPredicate2};
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/package-info.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/package-info.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/package-info.java	2015-11-13 20:08:45.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/package-info.java	2018-07-08 00:18:18.000000000 +0000
@@ -38,6 +38,5 @@
  * <li>WhileClosure</li>
  * </ul>
  *
- * @version $Id: package-info.java 1714262 2015-11-13 20:08:45Z tn $
  */
 package org.apache.commons.collections4.functors;
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/PredicateDecorator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/PredicateDecorator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/PredicateDecorator.java	2013-04-30 19:49:02.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/PredicateDecorator.java	2018-07-08 00:18:18.000000000 +0000
@@ -24,7 +24,6 @@
  * This interface enables tools to access the decorated predicates.
  *
  * @since 3.1
- * @version $Id: PredicateDecorator.java 1477798 2013-04-30 19:49:02Z tn $
  */
 public interface PredicateDecorator<T> extends Predicate<T> {
 
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/PredicateTransformer.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/PredicateTransformer.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/PredicateTransformer.java	2013-04-30 19:49:02.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/PredicateTransformer.java	2018-07-08 00:18:18.000000000 +0000
@@ -26,7 +26,6 @@
  * and then returns the result.
  *
  * @since 3.0
- * @version $Id: PredicateTransformer.java 1477798 2013-04-30 19:49:02Z tn $
  */
 public class PredicateTransformer<T> implements Transformer<T, Boolean>, Serializable {
 
@@ -48,7 +47,7 @@
         if (predicate == null) {
             throw new IllegalArgumentException("Predicate must not be null");
         }
-        return new PredicateTransformer<T>(predicate);
+        return new PredicateTransformer<>(predicate);
     }
 
     /**
@@ -68,6 +67,7 @@
      * @param input  the input object to transform
      * @return the transformed result
      */
+    @Override
     public Boolean transform(final T input) {
         return Boolean.valueOf(iPredicate.evaluate(input));
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/PrototypeFactory.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/PrototypeFactory.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/PrototypeFactory.java	2015-11-13 20:08:45.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/PrototypeFactory.java	2018-07-08 00:18:18.000000000 +0000
@@ -38,7 +38,6 @@
  * for more details.
  *
  * @since 3.0
- * @version $Id: PrototypeFactory.java 1714262 2015-11-13 20:08:45Z tn $
  */
 public class PrototypeFactory {
 
@@ -48,11 +47,13 @@
      * Creates a Factory that will return a clone of the same prototype object
      * each time the factory is used. The prototype will be cloned using one of these
      * techniques (in order):
+     * </p>
+     *
      * <ul>
-     * <li>public clone method
-     * <li>public copy constructor
-     * <li>serialization clone
-     * <ul>
+     * <li>public clone method</li>
+     * <li>public copy constructor</li>
+     * <li>serialization clone</li>
+     * </ul>
      *
      * @param <T>  the type the factory creates
      * @param prototype  the object to clone each time in the factory
@@ -67,18 +68,18 @@
         }
         try {
             final Method method = prototype.getClass().getMethod("clone", (Class[]) null);
-            return new PrototypeCloneFactory<T>(prototype, method);
+            return new PrototypeCloneFactory<>(prototype, method);
 
         } catch (final NoSuchMethodException ex) {
             try {
                 prototype.getClass().getConstructor(new Class<?>[] { prototype.getClass() });
-                return new InstantiateFactory<T>(
+                return new InstantiateFactory<>(
                     (Class<T>) prototype.getClass(),
                     new Class<?>[] { prototype.getClass() },
                     new Object[] { prototype });
             } catch (final NoSuchMethodException ex2) {
                 if (prototype instanceof Serializable) {
-                    return (Factory<T>) new PrototypeSerializationFactory<Serializable>((Serializable) prototype);
+                    return (Factory<T>) new PrototypeSerializationFactory<>((Serializable) prototype);
                 }
             }
         }
@@ -192,12 +193,12 @@
                     if (bais != null) {
                         bais.close();
                     }
-                } catch (final IOException ex) {
+                } catch (final IOException ex) { //NOPMD
                     // ignore
                 }
                 try {
                     baos.close();
-                } catch (final IOException ex) {
+                } catch (final IOException ex) { //NOPMD
                     // ignore
                 }
             }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/StringValueTransformer.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/StringValueTransformer.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/StringValueTransformer.java	2013-11-20 21:53:39.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/StringValueTransformer.java	2018-07-08 00:18:18.000000000 +0000
@@ -25,7 +25,6 @@
  * <code>String.valueOf</code> on the input object.
  *
  * @since 3.0
- * @version $Id: StringValueTransformer.java 1543964 2013-11-20 21:53:39Z tn $
  */
 public final class StringValueTransformer<T> implements Transformer<T, String>, Serializable {
 
@@ -33,7 +32,7 @@
     private static final long serialVersionUID = 7511110693171758606L;
 
     /** Singleton predicate instance */
-    private static final Transformer<Object, String> INSTANCE = new StringValueTransformer<Object>();
+    private static final Transformer<Object, String> INSTANCE = new StringValueTransformer<>();
 
     /**
      * Factory returning the singleton instance.
@@ -60,6 +59,7 @@
      * @param input  the input object to transform
      * @return the transformed result
      */
+    @Override
     public String transform(final T input) {
         return String.valueOf(input);
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/SwitchClosure.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/SwitchClosure.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/SwitchClosure.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/SwitchClosure.java	2018-07-08 00:18:18.000000000 +0000
@@ -27,7 +27,6 @@
  * like a switch statement.
  *
  * @since 3.0
- * @version $Id: SwitchClosure.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class SwitchClosure<E> implements Closure<E>, Serializable {
 
@@ -65,7 +64,7 @@
         if (predicates.length == 0) {
             return (Closure<E>) (defaultClosure == null ? NOPClosure.<E>nopClosure(): defaultClosure);
         }
-        return new SwitchClosure<E>(predicates, closures, defaultClosure);
+        return new SwitchClosure<>(predicates, closures, defaultClosure);
     }
 
     /**
@@ -105,7 +104,7 @@
             closures[i] = entry.getValue();
             i++;
         }
-        return new SwitchClosure<E>(false, preds, closures, defaultClosure);
+        return new SwitchClosure<>(false, preds, closures, defaultClosure);
     }
 
     /**
@@ -143,6 +142,7 @@
      *
      * @param input  the input object
      */
+    @Override
     public void execute(final E input) {
         for (int i = 0; i < iPredicates.length; i++) {
             if (iPredicates[i].evaluate(input) == true) {
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/SwitchTransformer.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/SwitchTransformer.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/SwitchTransformer.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/SwitchTransformer.java	2018-07-08 00:18:18.000000000 +0000
@@ -27,7 +27,6 @@
  * like a switch statement.
  *
  * @since 3.0
- * @version $Id: SwitchTransformer.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class SwitchTransformer<I, O> implements Transformer<I, O>, Serializable {
 
@@ -66,7 +65,7 @@
             return (Transformer<I, O>) (defaultTransformer == null ? ConstantTransformer.<I, O>nullTransformer() :
                                                                      defaultTransformer);
         }
-        return new SwitchTransformer<I, O>(predicates, transformers, defaultTransformer);
+        return new SwitchTransformer<>(predicates, transformers, defaultTransformer);
     }
 
     /**
@@ -114,7 +113,7 @@
             transformers[i] = entry.getValue();
             i++;
         }
-        return new SwitchTransformer<I, O>(false, preds, transformers, defaultTransformer);
+        return new SwitchTransformer<>(false, preds, transformers, defaultTransformer);
     }
 
     /**
@@ -157,6 +156,7 @@
      * @param input  the input object to transform
      * @return the transformed result
      */
+    @Override
     public O transform(final I input) {
         for (int i = 0; i < iPredicates.length; i++) {
             if (iPredicates[i].evaluate(input) == true) {
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/TransformedPredicate.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/TransformedPredicate.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/TransformedPredicate.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/TransformedPredicate.java	2018-07-08 00:18:18.000000000 +0000
@@ -26,7 +26,6 @@
  * another <code>Predicate</code>.
  *
  * @since 3.1
- * @version $Id: TransformedPredicate.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public final class TransformedPredicate<T> implements PredicateDecorator<T>, Serializable {
 
@@ -56,7 +55,7 @@
         if (predicate == null) {
             throw new NullPointerException("The predicate to call must not be null");
         }
-        return new TransformedPredicate<T>(transformer, predicate);
+        return new TransformedPredicate<>(transformer, predicate);
     }
 
     /**
@@ -79,6 +78,7 @@
      * @param object  the input object which will be transformed
      * @return true if decorated predicate returns true
      */
+    @Override
     public boolean evaluate(final T object) {
         final T result = iTransformer.transform(object);
         return iPredicate.evaluate(result);
@@ -90,6 +90,7 @@
      * @return the predicate as the only element in an array
      * @since 3.1
      */
+    @Override
     @SuppressWarnings("unchecked")
     public Predicate<? super T>[] getPredicates() {
         return new Predicate[] {iPredicate};
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/TransformerClosure.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/TransformerClosure.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/TransformerClosure.java	2013-04-30 19:49:02.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/TransformerClosure.java	2018-07-08 00:18:18.000000000 +0000
@@ -26,7 +26,6 @@
  * and ignore the result.
  *
  * @since 3.0
- * @version $Id: TransformerClosure.java 1477798 2013-04-30 19:49:02Z tn $
  */
 public class TransformerClosure<E> implements Closure<E>, Serializable {
 
@@ -49,7 +48,7 @@
         if (transformer == null) {
             return NOPClosure.<E>nopClosure();
         }
-        return new TransformerClosure<E>(transformer);
+        return new TransformerClosure<>(transformer);
     }
 
     /**
@@ -68,6 +67,7 @@
      *
      * @param input  the input object
      */
+    @Override
     public void execute(final E input) {
         iTransformer.transform(input);
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/TransformerPredicate.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/TransformerPredicate.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/TransformerPredicate.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/TransformerPredicate.java	2018-07-08 00:18:18.000000000 +0000
@@ -26,7 +26,6 @@
  * Predicate implementation that returns the result of a transformer.
  *
  * @since 3.0
- * @version $Id: TransformerPredicate.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public final class TransformerPredicate<T> implements Predicate<T>, Serializable {
 
@@ -48,7 +47,7 @@
         if (transformer == null) {
             throw new NullPointerException("The transformer to call must not be null");
         }
-        return new TransformerPredicate<T>(transformer);
+        return new TransformerPredicate<>(transformer);
     }
 
     /**
@@ -69,6 +68,7 @@
      * @return true if decorated transformer returns Boolean.TRUE
      * @throws FunctorException if the transformer returns an invalid type
      */
+    @Override
     public boolean evaluate(final T object) {
         final Boolean result = iTransformer.transform(object);
         if (result == null) {
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/TruePredicate.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/TruePredicate.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/TruePredicate.java	2013-11-20 21:13:35.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/TruePredicate.java	2018-07-08 00:18:18.000000000 +0000
@@ -24,7 +24,6 @@
  * Predicate implementation that always returns true.
  *
  * @since 3.0
- * @version $Id: TruePredicate.java 1543950 2013-11-20 21:13:35Z tn $
  */
 public final class TruePredicate<T> implements Predicate<T>, Serializable {
 
@@ -33,7 +32,7 @@
 
     /** Singleton predicate instance */
     @SuppressWarnings("rawtypes")
-    public static final Predicate INSTANCE = new TruePredicate<Object>();
+    public static final Predicate INSTANCE = new TruePredicate<>();
 
     /**
      * Factory returning the singleton instance.
@@ -44,7 +43,7 @@
      */
     @SuppressWarnings("unchecked")
     public static <T> Predicate<T> truePredicate() {
-        return (Predicate<T>) INSTANCE;
+        return INSTANCE;
     }
 
     /**
@@ -60,6 +59,7 @@
      * @param object  the input object
      * @return true always
      */
+    @Override
     public boolean evaluate(final T object) {
         return true;
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/UniquePredicate.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/UniquePredicate.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/UniquePredicate.java	2013-04-27 14:13:54.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/UniquePredicate.java	2018-07-08 00:18:18.000000000 +0000
@@ -27,7 +27,6 @@
  * passed into the predicate.
  *
  * @since 3.0
- * @version $Id: UniquePredicate.java 1476582 2013-04-27 14:13:54Z tn $
  */
 public final class UniquePredicate<T> implements Predicate<T>, Serializable {
 
@@ -35,7 +34,7 @@
     private static final long serialVersionUID = -3319417438027438040L;
 
     /** The set of previously seen objects */
-    private final Set<T> iSet = new HashSet<T>();
+    private final Set<T> iSet = new HashSet<>();
 
     /**
      * Factory to create the predicate.
@@ -45,7 +44,7 @@
      * @throws IllegalArgumentException if the predicate is null
      */
     public static <T> Predicate<T> uniquePredicate() {
-        return new UniquePredicate<T>();
+        return new UniquePredicate<>();
     }
 
     /**
@@ -63,6 +62,7 @@
      * @param object  the input object
      * @return true if this is the first time the object is seen
      */
+    @Override
     public boolean evaluate(final T object) {
         return iSet.add(object);
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/WhileClosure.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/WhileClosure.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/functors/WhileClosure.java	2015-11-13 20:08:45.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/functors/WhileClosure.java	2018-07-08 00:18:18.000000000 +0000
@@ -29,7 +29,6 @@
  * for more details.
  *
  * @since 3.0
- * @version $Id: WhileClosure.java 1714262 2015-11-13 20:08:45Z tn $
  */
 public class WhileClosure<E> implements Closure<E> {
 
@@ -58,7 +57,7 @@
         if (closure == null) {
             throw new NullPointerException("Closure must not be null");
         }
-        return new WhileClosure<E>(predicate, closure, doLoop);
+        return new WhileClosure<>(predicate, closure, doLoop);
     }
 
     /**
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/Get.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/Get.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/Get.java	2013-11-19 00:48:44.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/Get.java	2018-07-08 00:18:18.000000000 +0000
@@ -22,54 +22,72 @@
 /**
  * The "read" subset of the {@link java.util.Map} interface.
  *
- * @since 4.0
- * @version $Id: Get.java 1543265 2013-11-19 00:48:44Z ggregory $
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  *
+ * @since 4.0
  * @see Put
  */
 public interface Get<K, V> {
 
     /**
+     * @param key key whose presence in this map is to be tested
+     * @return <code>true</code> if this map contains a mapping for the specified
+     *         key
      * @see java.util.Map#containsKey(Object)
      */
     boolean containsKey(Object key);
 
     /**
+     * @param value value whose presence in this map is to be tested
+     * @return <code>true</code> if this map maps one or more keys to the
+     *         specified value
      * @see java.util.Map#containsValue(Object)
      */
     boolean containsValue(Object value);
 
     /**
+     * @return a set view of the mappings contained in this map
      * @see java.util.Map#entrySet()
      */
     Set<java.util.Map.Entry<K, V>> entrySet();
 
     /**
+     * @param key the key whose associated value is to be returned
+     * @return the value to which the specified key is mapped, or
+     *         {@code null} if this map contains no mapping for the key
      * @see java.util.Map#get(Object)
      */
     V get(Object key);
 
     /**
+     * @param key key whose mapping is to be removed from the map
+     * @return the previous value associated with <code>key</code>, or
+     *         <code>null</code> if there was no mapping for <code>key</code>.
      * @see java.util.Map#remove(Object)
      */
     V remove(Object key);
 
     /**
+     * @return <code>true</code> if this map contains no key-value mappings
      * @see java.util.Map#isEmpty()
      */
     boolean isEmpty();
 
     /**
+     * @return a set view of the keys contained in this map
      * @see java.util.Map#keySet()
      */
     Set<K> keySet();
 
     /**
+     * @return the number of key-value mappings in this map
      * @see java.util.Map#size()
      */
     int size();
 
     /**
+     * @return a collection view of the values contained in this map
      * @see java.util.Map#values()
      */
     Collection<V> values();
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/IterableGet.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/IterableGet.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/IterableGet.java	2013-04-30 18:55:24.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/IterableGet.java	2018-07-08 00:18:18.000000000 +0000
@@ -19,9 +19,10 @@
 /**
  * The "read" subset of the {@link java.util.Map} interface.
  *
- * @since 4.0
- * @version $Id: IterableGet.java 1477779 2013-04-30 18:55:24Z tn $
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  *
+ * @since 4.0
  * @see Put
  */
 public interface IterableGet<K, V> extends Get<K, V> {
@@ -31,8 +32,8 @@
      * A map iterator is an efficient way of iterating over maps.
      * There is no need to access the entry set or use Map Entry objects.
      * <pre>
-     * IterableMap<String,Integer> map = new HashedMap<String,Integer>();
-     * MapIterator<String,Integer> it = map.mapIterator();
+     * IterableMap&lt;String,Integer&gt; map = new HashedMap&lt;String,Integer&gt;();
+     * MapIterator&lt;String,Integer&gt; it = map.mapIterator();
      * while (it.hasNext()) {
      *   String key = it.next();
      *   Integer value = it.getValue();
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/IterableMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/IterableMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/IterableMap.java	2013-04-17 17:37:03.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/IterableMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -24,8 +24,8 @@
  * A map iterator is an efficient way of iterating over maps.
  * There is no need to access the entry set or use Map Entry objects.
  * <pre>
- * IterableMap<String,Integer> map = new HashedMap<String,Integer>();
- * MapIterator<String,Integer> it = map.mapIterator();
+ * IterableMap&lt;String,Integer&gt; map = new HashedMap&lt;String,Integer&gt;();
+ * MapIterator&lt;String,Integer&gt; it = map.mapIterator();
  * while (it.hasNext()) {
  *   String key = it.next();
  *   Integer value = it.getValue();
@@ -33,11 +33,11 @@
  * }
  * </pre>
  *
- * @param <K> the type of the keys in the map
- * @param <V> the type of the values in the map
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  *
  * @since 3.0
- * @version $Id: IterableMap.java 1469004 2013-04-17 17:37:03Z tn $
  */
 public interface IterableMap<K, V> extends Map<K, V>, Put<K, V>, IterableGet<K, V> {
+    // empty
 }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/IterableSortedMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/IterableSortedMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/IterableSortedMap.java	2013-04-17 17:37:03.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/IterableSortedMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -25,7 +25,6 @@
  * @param <V> the type of the values in the map
  *
  * @since 4.0
- * @version $Id: IterableSortedMap.java 1469004 2013-04-17 17:37:03Z tn $
  */
 public interface IterableSortedMap<K, V> extends SortedMap<K, V>, OrderedMap<K, V> {
 }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/IterableUtils.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/IterableUtils.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/IterableUtils.java	2015-11-25 20:27:49.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/IterableUtils.java	2018-07-08 00:18:18.000000000 +0000
@@ -45,7 +45,6 @@
  * </ul>
  *
  * @since 4.1
- * @version $Id: IterableUtils.java 1716538 2015-11-25 20:27:49Z tn $
  */
 public class IterableUtils {
 
@@ -173,12 +172,11 @@
             public Iterator<E> iterator() {
                 return new LazyIteratorChain<E>() {
                     @Override
-                    protected Iterator<? extends E> nextIterator(int count) {
+                    protected Iterator<? extends E> nextIterator(final int count) {
                         if (count > iterables.length) {
                             return null;
-                        } else {
-                            return iterables[count - 1].iterator();
                         }
+                        return iterables[count - 1].iterator();
                     }
                 };
             }
@@ -326,12 +324,11 @@
             public Iterator<E> iterator() {
                 return new LazyIteratorChain<E>() {
                     @Override
-                    protected Iterator<? extends E> nextIterator(int count) {
+                    protected Iterator<? extends E> nextIterator(final int count) {
                         if (IterableUtils.isEmpty(iterable)) {
                             return null;
-                        } else {
-                            return iterable.iterator();
                         }
+                        return iterable.iterator();
                     }
                 };
             }
@@ -365,7 +362,7 @@
                 final List<E> list = (iterable instanceof List<?>) ?
                         (List<E>) iterable :
                         IteratorUtils.toList(iterable.iterator());
-                return new ReverseListIterator<E>(list);
+                return new ReverseListIterator<>(list);
             }
         };
     }
@@ -451,7 +448,7 @@
         return new FluentIterable<E>() {
             @Override
             public Iterator<E> iterator() {
-                return new UniqueFilterIterator<E>(iterable.iterator());
+                return new UniqueFilterIterator<>(iterable.iterator());
             }
         };
     }
@@ -474,7 +471,7 @@
         if (iterable instanceof UnmodifiableIterable<?>) {
             return iterable;
         }
-        return new UnmodifiableIterable<E>(iterable);
+        return new UnmodifiableIterable<>(iterable);
     }
 
     /**
@@ -549,6 +546,7 @@
             @Override
             public Iterator<E> iterator() {
                 @SuppressWarnings("unchecked") // safe
+                final
                 Iterator<? extends E>[] iterators = new Iterator[others.length + 1];
                 iterators[0] = first.iterator();
                 for (int i = 0; i < others.length; i++) {
@@ -691,9 +689,8 @@
     public static boolean isEmpty(final Iterable<?> iterable) {
         if (iterable instanceof Collection<?>) {
             return ((Collection<?>) iterable).isEmpty();
-        } else {
-            return IteratorUtils.isEmpty(emptyIteratorIfNull(iterable));
         }
+        return IteratorUtils.isEmpty(emptyIteratorIfNull(iterable));
     }
 
     /**
@@ -709,9 +706,8 @@
     public static <E> boolean contains(final Iterable<E> iterable, final Object object) {
         if (iterable instanceof Collection<?>) {
             return ((Collection<E>) iterable).contains(object);
-        } else {
-            return IteratorUtils.contains(emptyIteratorIfNull(iterable), object);
         }
+        return IteratorUtils.contains(emptyIteratorIfNull(iterable), object);
     }
 
     /**
@@ -746,7 +742,7 @@
      * @param <T> the element type of the object to find
      * @param iterable  the {@link Iterable} to search
      * @param obj  the object to find the cardinality of
-     * @return the the number of occurrences of obj in iterable
+     * @return the number of occurrences of obj in iterable
      */
     public static <E, T extends E> int frequency(final Iterable<E> iterable, final T obj) {
         if (iterable instanceof Set<?>) {
@@ -779,6 +775,26 @@
     }
 
     /**
+     * Shortcut for {@code get(iterator, 0)}.
+     * <p>
+     * Returns the <code>first</code> value in the <code>iterable</code>'s {@link Iterator}, throwing
+     * <code>IndexOutOfBoundsException</code> if there is no such element.
+     * </p>
+     * <p>
+     * If the {@link Iterable} is a {@link List}, then it will use {@link List#get(int)}.
+     * </p>
+     *
+     * @param <T> the type of object in the {@link Iterable}.
+     * @param iterable  the {@link Iterable} to get a value from, may be null
+     * @return the first object
+     * @throws IndexOutOfBoundsException if the request  is invalid
+     * @since 4.2
+     */
+    public static <T> T first(final Iterable<T> iterable) {
+        return get(iterable, 0);
+    }
+
+    /**
      * Returns the number of elements contained in the given iterator.
      * <p>
      * A <code>null</code> or empty iterator returns {@code 0}.
@@ -789,9 +805,8 @@
     public static int size(final Iterable<?> iterable) {
         if (iterable instanceof Collection<?>) {
             return ((Collection<?>) iterable).size();
-        } else {
-            return IteratorUtils.size(emptyIteratorIfNull(iterable));
         }
+        return IteratorUtils.size(emptyIteratorIfNull(iterable));
     }
 
     /**
@@ -921,7 +936,7 @@
             throw new NullPointerException("Predicates must not be null.");
         }
 
-        for (Predicate<?> p : predicates) {
+        for (final Predicate<?> p : predicates) {
             if (p == null) {
                 throw new NullPointerException("Predicate must not be null.");
             }
@@ -937,7 +952,7 @@
         // create the empty partitions
         final int numberOfPredicates = predicates.length;
         final int numberOfPartitions = numberOfPredicates + 1;
-        final List<R> partitions = new ArrayList<R>(numberOfPartitions);
+        final List<R> partitions = new ArrayList<>(numberOfPartitions);
         for (int i = 0; i < numberOfPartitions; ++i) {
             partitions.add(partitionFactory.create());
         }
@@ -1059,7 +1074,7 @@
     /**
      * Fail-fast check for null arguments.
      *
-     * @param iterable  the iterable to check
+     * @param iterables  the iterables to check
      * @throws NullPointerException if the argument or any of its contents is null
      */
     static void checkNotNull(final Iterable<?>... iterables) {
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/AbstractEmptyIterator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/AbstractEmptyIterator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/AbstractEmptyIterator.java	2013-04-30 20:01:28.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/AbstractEmptyIterator.java	2018-07-08 00:18:18.000000000 +0000
@@ -22,7 +22,6 @@
  * Provides an implementation of an empty iterator.
  *
  * @since 3.1
- * @version $Id: AbstractEmptyIterator.java 1477802 2013-04-30 20:01:28Z tn $
  */
 abstract class AbstractEmptyIterator<E> {
 
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/AbstractEmptyMapIterator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/AbstractEmptyMapIterator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/AbstractEmptyMapIterator.java	2013-04-30 20:01:28.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/AbstractEmptyMapIterator.java	2018-07-08 00:18:18.000000000 +0000
@@ -20,7 +20,6 @@
  * Provides an implementation of an empty map iterator.
  *
  * @since 4.0
- * @version $Id: AbstractEmptyMapIterator.java 1477802 2013-04-30 20:01:28Z tn $
  */
 public abstract class AbstractEmptyMapIterator<K, V> extends AbstractEmptyIterator<K> {
 
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/AbstractIteratorDecorator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/AbstractIteratorDecorator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/AbstractIteratorDecorator.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/AbstractIteratorDecorator.java	2018-07-08 00:18:18.000000000 +0000
@@ -24,7 +24,6 @@
  * All methods are forwarded to the decorated iterator.
  *
  * @since 3.0
- * @version $Id: AbstractIteratorDecorator.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public abstract class AbstractIteratorDecorator<E> extends AbstractUntypedIteratorDecorator<E, E> {
 
@@ -40,6 +39,7 @@
     }
 
     /** {@inheritDoc} */
+    @Override
     public E next() {
         return getIterator().next();
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/AbstractListIteratorDecorator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/AbstractListIteratorDecorator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/AbstractListIteratorDecorator.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/AbstractListIteratorDecorator.java	2018-07-08 00:18:18.000000000 +0000
@@ -24,7 +24,6 @@
  * All methods are forwarded to the decorated list iterator.
  *
  * @since 3.0
- * @version $Id: AbstractListIteratorDecorator.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class AbstractListIteratorDecorator<E> implements ListIterator<E> {
 
@@ -58,46 +57,55 @@
     //-----------------------------------------------------------------------
 
     /** {@inheritDoc} */
+    @Override
     public boolean hasNext() {
         return iterator.hasNext();
     }
 
     /** {@inheritDoc} */
+    @Override
     public E next() {
         return iterator.next();
     }
 
     /** {@inheritDoc} */
+    @Override
     public int nextIndex() {
         return iterator.nextIndex();
     }
 
     /** {@inheritDoc} */
+    @Override
     public boolean hasPrevious() {
         return iterator.hasPrevious();
     }
 
     /** {@inheritDoc} */
+    @Override
     public E previous() {
         return iterator.previous();
     }
 
     /** {@inheritDoc} */
+    @Override
     public int previousIndex() {
         return iterator.previousIndex();
     }
 
     /** {@inheritDoc} */
+    @Override
     public void remove() {
         iterator.remove();
     }
 
     /** {@inheritDoc} */
+    @Override
     public void set(final E obj) {
         iterator.set(obj);
     }
 
     /** {@inheritDoc} */
+    @Override
     public void add(final E obj) {
         iterator.add(obj);
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/AbstractMapIteratorDecorator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/AbstractMapIteratorDecorator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/AbstractMapIteratorDecorator.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/AbstractMapIteratorDecorator.java	2018-07-08 00:18:18.000000000 +0000
@@ -24,7 +24,6 @@
  * All methods are forwarded to the decorated map iterator.
  *
  * @since 3.0
- * @version $Id: AbstractMapIteratorDecorator.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class AbstractMapIteratorDecorator<K, V> implements MapIterator<K, V> {
 
@@ -58,31 +57,37 @@
     //-----------------------------------------------------------------------
 
     /** {@inheritDoc} */
+    @Override
     public boolean hasNext() {
         return iterator.hasNext();
     }
 
     /** {@inheritDoc} */
+    @Override
     public K next() {
         return iterator.next();
     }
 
     /** {@inheritDoc} */
+    @Override
     public void remove() {
         iterator.remove();
     }
 
     /** {@inheritDoc} */
+    @Override
     public K getKey() {
         return iterator.getKey();
     }
 
     /** {@inheritDoc} */
+    @Override
     public V getValue() {
         return iterator.getValue();
     }
 
     /** {@inheritDoc} */
+    @Override
     public V setValue(final V obj) {
         return iterator.setValue(obj);
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorDecorator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorDecorator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorDecorator.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorDecorator.java	2018-07-08 00:18:18.000000000 +0000
@@ -24,7 +24,6 @@
  * All methods are forwarded to the decorated map iterator.
  *
  * @since 3.0
- * @version $Id: AbstractOrderedMapIteratorDecorator.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class AbstractOrderedMapIteratorDecorator<K, V> implements OrderedMapIterator<K, V> {
 
@@ -58,41 +57,49 @@
     //-----------------------------------------------------------------------
 
     /** {@inheritDoc} */
+    @Override
     public boolean hasNext() {
         return iterator.hasNext();
     }
 
     /** {@inheritDoc} */
+    @Override
     public K next() {
         return iterator.next();
     }
 
     /** {@inheritDoc} */
+    @Override
     public boolean hasPrevious() {
         return iterator.hasPrevious();
     }
 
     /** {@inheritDoc} */
+    @Override
     public K previous() {
         return iterator.previous();
     }
 
     /** {@inheritDoc} */
+    @Override
     public void remove() {
         iterator.remove();
     }
 
     /** {@inheritDoc} */
+    @Override
     public K getKey() {
         return iterator.getKey();
     }
 
     /** {@inheritDoc} */
+    @Override
     public V getValue() {
         return iterator.getValue();
     }
 
     /** {@inheritDoc} */
+    @Override
     public V setValue(final V obj) {
         return iterator.setValue(obj);
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/AbstractUntypedIteratorDecorator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/AbstractUntypedIteratorDecorator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/AbstractUntypedIteratorDecorator.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/AbstractUntypedIteratorDecorator.java	2018-07-08 00:18:18.000000000 +0000
@@ -25,7 +25,6 @@
  * All methods are forwarded to the decorated iterator.
  *
  * @since 4.0
- * @version $Id: AbstractUntypedIteratorDecorator.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public abstract class AbstractUntypedIteratorDecorator<I, O> implements Iterator<O> {
 
@@ -55,10 +54,12 @@
         return iterator;
     }
 
+    @Override
     public boolean hasNext() {
         return iterator.hasNext();
     }
 
+    @Override
     public void remove() {
         iterator.remove();
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/ArrayIterator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/ArrayIterator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/ArrayIterator.java	2013-06-18 20:09:15.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/ArrayIterator.java	2018-07-08 00:18:18.000000000 +0000
@@ -32,8 +32,8 @@
  * The iterator implements a {@link #reset} method, allowing the reset of
  * the iterator back to the start if required.
  *
+ * @param <E> the type of elements returned by this iterator
  * @since 1.0
- * @version $Id: ArrayIterator.java 1494282 2013-06-18 20:09:15Z sebb $
  */
 public class ArrayIterator<E> implements ResettableIterator<E> {
 
@@ -131,6 +131,7 @@
      *
      * @return true if there is a next element to return
      */
+    @Override
     public boolean hasNext() {
         return index < endIndex;
     }
@@ -142,6 +143,7 @@
      * @throws NoSuchElementException if all the elements in the array
      *  have already been returned
      */
+    @Override
     @SuppressWarnings("unchecked")
     public E next() {
         if (hasNext() == false) {
@@ -155,6 +157,7 @@
      *
      * @throws UnsupportedOperationException always
      */
+    @Override
     public void remove() {
         throw new UnsupportedOperationException("remove() method is not supported");
     }
@@ -193,6 +196,7 @@
     /**
      * Resets the iterator back to the start index.
      */
+    @Override
     public void reset() {
         this.index = this.startIndex;
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/ArrayListIterator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/ArrayListIterator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/ArrayListIterator.java	2013-11-20 21:23:53.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/ArrayListIterator.java	2018-07-08 00:18:18.000000000 +0000
@@ -22,7 +22,7 @@
 import org.apache.commons.collections4.ResettableListIterator;
 
 /**
- * Implements a {@link ListIterator} over an array.
+ * Implements a {@link java.util.ListIterator} over an array.
  * <p>
  * The array can be either an array of object or of primitives. If you know
  * that you have an object array, the {@link ObjectArrayListIterator}
@@ -37,7 +37,6 @@
  * @see java.util.ListIterator
  *
  * @since 3.0
- * @version $Id: ArrayListIterator.java 1543955 2013-11-20 21:23:53Z tn $
  */
 public class ArrayListIterator<E> extends ArrayIterator<E>
         implements ResettableListIterator<E> {
@@ -101,6 +100,7 @@
      *
      * @return true if there is a previous element to return
      */
+    @Override
     public boolean hasPrevious() {
         return this.index > this.startIndex;
     }
@@ -111,6 +111,7 @@
      * @return the previous element
      * @throws NoSuchElementException if there is no previous element
      */
+    @Override
     @SuppressWarnings("unchecked")
     public E previous() {
         if (hasPrevious() == false) {
@@ -141,6 +142,7 @@
      *
      * @return the index of the item to be retrieved next
      */
+    @Override
     public int nextIndex() {
         return this.index - this.startIndex;
     }
@@ -150,6 +152,7 @@
      *
      * @return the index of the item to be retrieved next
      */
+    @Override
     public int previousIndex() {
         return this.index - this.startIndex - 1;
     }
@@ -162,6 +165,7 @@
      * @throws UnsupportedOperationException always thrown.
      * @see java.util.ListIterator#set
      */
+    @Override
     public void add(final Object o) {
         throw new UnsupportedOperationException("add() method is not supported");
     }
@@ -172,9 +176,9 @@
      * This method sets the element that was returned by the last call
      * to {@link #next()} of {@link #previous()}.
      * <p>
-     * <b>Note:</b> {@link ListIterator} implementations that support
+     * <b>Note:</b> {@link java.util.ListIterator} implementations that support
      * <code>add()</code> and <code>remove()</code> only allow <code>set()</code> to be called
-     * once per call to <code>next()</code> or <code>previous</code> (see the {@link ListIterator}
+     * once per call to <code>next()</code> or <code>previous</code> (see the {@link java.util.ListIterator}
      * javadoc for more details). Since this implementation does
      * not support <code>add()</code> or <code>remove()</code>, <code>set()</code> may be
      * called as often as desired.
@@ -184,6 +188,7 @@
      * before {@link #set(Object)}
      * @see java.util.ListIterator#set
      */
+    @Override
     public void set(final Object o) {
         if (this.lastItemIndex == -1) {
             throw new IllegalStateException("must call next() or previous() before a call to set()");
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/BoundedIterator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/BoundedIterator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/BoundedIterator.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/BoundedIterator.java	2018-07-08 00:18:18.000000000 +0000
@@ -29,7 +29,6 @@
  * before that position.
  *
  * @since 4.1
- * @version $Id: BoundedIterator.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class BoundedIterator<E> implements Iterator<E> {
 
@@ -90,6 +89,7 @@
 
     //-----------------------------------------------------------------------
 
+    @Override
     public boolean hasNext() {
         if (!checkBounds()) {
             return false;
@@ -108,6 +108,7 @@
         return true;
     }
 
+    @Override
     public E next() {
         if (!checkBounds()) {
             throw new NoSuchElementException();
@@ -125,6 +126,7 @@
      * {@link IllegalStateException} if no explicit call to {@link #next()} has been made prior
      * to calling {@link #remove()}.
      */
+    @Override
     public void remove() {
         if (pos <= offset) {
             throw new IllegalStateException("remove() can not be called before calling next()");
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/CollatingIterator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/CollatingIterator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/CollatingIterator.java	2015-06-04 20:38:03.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/CollatingIterator.java	2018-07-08 00:18:18.000000000 +0000
@@ -36,7 +36,6 @@
  * lesser of <code>A.next()</code> and <code>B.next()</code>.
  *
  * @since 2.1
- * @version $Id: CollatingIterator.java 1683632 2015-06-04 20:38:03Z tn $
  */
 public class CollatingIterator<E> implements Iterator<E> {
 
@@ -95,7 +94,7 @@
      *   child iterators
      */
     public CollatingIterator(final Comparator<? super E> comp, final int initIterCapacity) {
-        iterators = new ArrayList<Iterator<? extends E>>(initIterCapacity);
+        iterators = new ArrayList<>(initIterCapacity);
         setComparator(comp);
     }
 
@@ -227,6 +226,7 @@
      *
      * @return true if this iterator has remaining elements
      */
+    @Override
     public boolean hasNext() {
         start();
         return anyValueSet(valueSet) || anyHasNext(iterators);
@@ -238,6 +238,7 @@
      * @return the next ordered element
      * @throws NoSuchElementException if no child iterator has any more elements
      */
+    @Override
     public E next() throws NoSuchElementException {
         if (hasNext() == false) {
             throw new NoSuchElementException();
@@ -258,6 +259,7 @@
      * @throws IllegalStateException if there is no last returned element, or if
      * the last returned element has already been removed
      */
+    @Override
     public void remove() {
         if (lastReturned == -1) {
             throw new IllegalStateException("No value can be removed at present");
@@ -286,7 +288,7 @@
      */
     private void start() {
         if (values == null) {
-            values = new ArrayList<E>(iterators.size());
+            values = new ArrayList<>(iterators.size());
             valueSet = new BitSet(iterators.size());
             for (int i = 0; i < iterators.size(); i++) {
                 values.add(null);
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/EmptyIterator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/EmptyIterator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/EmptyIterator.java	2013-11-20 21:23:53.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/EmptyIterator.java	2018-07-08 00:18:18.000000000 +0000
@@ -28,7 +28,6 @@
  * 2.1.1 and 3.1 due to issues with <code>IteratorUtils</code>.
  *
  * @since 2.1.1 and 3.1
- * @version $Id: EmptyIterator.java 1543955 2013-11-20 21:23:53Z tn $
  */
 public class EmptyIterator<E> extends AbstractEmptyIterator<E> implements ResettableIterator<E> {
 
@@ -37,7 +36,7 @@
      * @since 3.1
      */
     @SuppressWarnings("rawtypes")
-    public static final ResettableIterator RESETTABLE_INSTANCE = new EmptyIterator<Object>();
+    public static final ResettableIterator RESETTABLE_INSTANCE = new EmptyIterator<>();
 
     /**
      * Singleton instance of the iterator.
@@ -49,21 +48,21 @@
     /**
      * Get a typed resettable empty iterator instance.
      * @param <E> the element type
-     * @return ResettableIterator<E>
+     * @return ResettableIterator&lt;E&gt;
      */
     @SuppressWarnings("unchecked")
     public static <E> ResettableIterator<E> resettableEmptyIterator() {
-        return (ResettableIterator<E>) RESETTABLE_INSTANCE;
+        return RESETTABLE_INSTANCE;
     }
 
     /**
      * Get a typed empty iterator instance.
      * @param <E> the element type
-     * @return Iterator<E>
+     * @return Iterator&lt;E&gt;
      */
     @SuppressWarnings("unchecked")
     public static <E> Iterator<E> emptyIterator() {
-        return (Iterator<E>) INSTANCE;
+        return INSTANCE;
     }
 
     /**
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/EmptyListIterator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/EmptyListIterator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/EmptyListIterator.java	2013-11-20 21:23:53.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/EmptyListIterator.java	2018-07-08 00:18:18.000000000 +0000
@@ -28,7 +28,6 @@
  * due to issues with <code>IteratorUtils</code>.
  *
  * @since 2.1.1 and 3.1
- * @version $Id: EmptyListIterator.java 1543955 2013-11-20 21:23:53Z tn $
  */
 public class EmptyListIterator<E> extends AbstractEmptyIterator<E> implements
         ResettableListIterator<E> {
@@ -38,7 +37,7 @@
      * @since 3.1
      */
     @SuppressWarnings("rawtypes")
-    public static final ResettableListIterator RESETTABLE_INSTANCE = new EmptyListIterator<Object>();
+    public static final ResettableListIterator RESETTABLE_INSTANCE = new EmptyListIterator<>();
 
     /**
      * Singleton instance of the iterator.
@@ -50,21 +49,21 @@
     /**
      * Get a typed instance of the iterator.
      * @param <E> the element type
-     * @return {@link ResettableListIterator}<E>
+     * @return {@link ResettableListIterator}&lt;E&gt;
      */
     @SuppressWarnings("unchecked")
     public static <E> ResettableListIterator<E> resettableEmptyListIterator() {
-        return (ResettableListIterator<E>) RESETTABLE_INSTANCE;
+        return RESETTABLE_INSTANCE;
     }
 
     /**
      * Get a typed instance of the iterator.
      * @param <E> the element type
-     * @return {@link ListIterator}<E>
+     * @return {@link ListIterator}&lt;E&gt;
      */
     @SuppressWarnings("unchecked")
     public static <E> ListIterator<E> emptyListIterator() {
-        return (ListIterator<E>) INSTANCE;
+        return INSTANCE;
     }
 
     /**
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/EmptyMapIterator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/EmptyMapIterator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/EmptyMapIterator.java	2013-11-20 21:23:53.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/EmptyMapIterator.java	2018-07-08 00:18:18.000000000 +0000
@@ -23,7 +23,6 @@
  * Provides an implementation of an empty map iterator.
  *
  * @since 3.1
- * @version $Id: EmptyMapIterator.java 1543955 2013-11-20 21:23:53Z tn $
  */
 public class EmptyMapIterator<K, V> extends AbstractEmptyMapIterator<K, V> implements
         MapIterator<K, V>, ResettableIterator<K> {
@@ -33,17 +32,17 @@
      * @since 3.1
      */
     @SuppressWarnings("rawtypes")
-    public static final MapIterator INSTANCE = new EmptyMapIterator<Object, Object>();
+    public static final MapIterator INSTANCE = new EmptyMapIterator<>();
 
     /**
      * Get a typed instance of the iterator.
      * @param <K> the key type
      * @param <V> the value type
-     * @return {@link MapIterator}<K, V>
+     * @return {@link MapIterator}&lt;K, V&gt;
      */
     @SuppressWarnings("unchecked")
     public static <K, V> MapIterator<K, V> emptyMapIterator() {
-        return (MapIterator<K, V>) INSTANCE;
+        return INSTANCE;
     }
 
     /**
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedIterator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedIterator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedIterator.java	2013-11-20 21:23:53.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedIterator.java	2018-07-08 00:18:18.000000000 +0000
@@ -23,7 +23,6 @@
  * Provides an implementation of an empty ordered iterator.
  *
  * @since 3.1
- * @version $Id: EmptyOrderedIterator.java 1543955 2013-11-20 21:23:53Z tn $
  */
 public class EmptyOrderedIterator<E> extends AbstractEmptyIterator<E>
         implements OrderedIterator<E>, ResettableIterator<E> {
@@ -33,16 +32,16 @@
      * @since 3.1
      */
     @SuppressWarnings("rawtypes")
-    public static final OrderedIterator INSTANCE = new EmptyOrderedIterator<Object>();
+    public static final OrderedIterator INSTANCE = new EmptyOrderedIterator<>();
 
     /**
      * Typed instance of the iterator.
      * @param <E> the element type
-     * @return OrderedIterator<E>
+     * @return OrderedIterator&lt;E&gt;
      */
     @SuppressWarnings("unchecked")
     public static <E> OrderedIterator<E> emptyOrderedIterator() {
-        return (OrderedIterator<E>) INSTANCE;
+        return INSTANCE;
     }
 
     /**
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedMapIterator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedMapIterator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedMapIterator.java	2013-11-20 21:23:53.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/EmptyOrderedMapIterator.java	2018-07-08 00:18:18.000000000 +0000
@@ -23,7 +23,6 @@
  * Provides an implementation of an empty ordered map iterator.
  *
  * @since 3.1
- * @version $Id: EmptyOrderedMapIterator.java 1543955 2013-11-20 21:23:53Z tn $
  */
 public class EmptyOrderedMapIterator<K, V> extends AbstractEmptyMapIterator<K, V>
         implements OrderedMapIterator<K, V>, ResettableIterator<K> {
@@ -33,17 +32,17 @@
      * @since 3.1
      */
     @SuppressWarnings("rawtypes")
-    public static final OrderedMapIterator INSTANCE = new EmptyOrderedMapIterator<Object, Object>();
+    public static final OrderedMapIterator INSTANCE = new EmptyOrderedMapIterator<>();
 
     /**
      * Get a typed instance of the iterator.
      * @param <K> the key type
      * @param <V> the value type
-     * @return {@link OrderedMapIterator}<K, V>
+     * @return {@link OrderedMapIterator}&lt;K, V&gt;
      */
     @SuppressWarnings("unchecked")
     public static <K, V> OrderedMapIterator<K, V> emptyOrderedMapIterator() {
-        return (OrderedMapIterator<K, V>) INSTANCE;
+        return INSTANCE;
     }
 
     /**
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/EntrySetMapIterator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/EntrySetMapIterator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/EntrySetMapIterator.java	2013-04-30 20:01:28.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/EntrySetMapIterator.java	2018-07-08 00:18:18.000000000 +0000
@@ -35,7 +35,6 @@
  * </pre>
  *
  * @since 3.0
- * @version $Id: EntrySetMapIterator.java 1477802 2013-04-30 20:01:28Z tn $
  */
 public class EntrySetMapIterator<K, V> implements MapIterator<K, V>, ResettableIterator<K> {
 
@@ -61,6 +60,7 @@
      *
      * @return <code>true</code> if the iterator has more elements
      */
+    @Override
     public boolean hasNext() {
         return iterator.hasNext();
     }
@@ -71,6 +71,7 @@
      * @return the next key in the iteration
      * @throws java.util.NoSuchElementException if the iteration is finished
      */
+    @Override
     public K next() {
         last = iterator.next();
         canRemove = true;
@@ -88,6 +89,7 @@
      * @throws IllegalStateException if <code>remove()</code> has already been called
      *  since the last call to <code>next()</code>
      */
+    @Override
     public void remove() {
         if (canRemove == false) {
             throw new IllegalStateException("Iterator remove() can only be called once after next()");
@@ -105,6 +107,7 @@
      * @return the current key
      * @throws IllegalStateException if <code>next()</code> has not yet been called
      */
+    @Override
     public K getKey() {
         if (last == null) {
             throw new IllegalStateException("Iterator getKey() can only be called after next() and before remove()");
@@ -119,6 +122,7 @@
      * @return the current value
      * @throws IllegalStateException if <code>next()</code> has not yet been called
      */
+    @Override
     public V getValue() {
         if (last == null) {
             throw new IllegalStateException("Iterator getValue() can only be called after next() and before remove()");
@@ -136,6 +140,7 @@
      * @throws IllegalStateException if <code>remove()</code> has been called since the
      *  last call to <code>next()</code>
      */
+    @Override
     public V setValue(final V value) {
         if (last == null) {
             throw new IllegalStateException("Iterator setValue() can only be called after next() and before remove()");
@@ -147,6 +152,7 @@
     /**
      * Resets the state of the iterator.
      */
+    @Override
     public void reset() {
         iterator = map.entrySet().iterator();
         last = null;
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/EnumerationIterator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/EnumerationIterator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/EnumerationIterator.java	2013-04-30 20:01:28.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/EnumerationIterator.java	2018-07-08 00:18:18.000000000 +0000
@@ -25,7 +25,6 @@
  * to be {@link Iterator Iterator} instances.
  *
  * @since 1.0
- * @version $Id: EnumerationIterator.java 1477802 2013-04-30 20:01:28Z tn $
  */
 public class EnumerationIterator<E> implements Iterator<E> {
 
@@ -78,6 +77,7 @@
      * @return true if the underlying enumeration has more elements
      * @throws NullPointerException  if the underlying enumeration is null
      */
+    @Override
     public boolean hasNext() {
         return enumeration.hasMoreElements();
     }
@@ -88,6 +88,7 @@
      * @return the next object from the enumeration
      * @throws NullPointerException if the enumeration is null
      */
+    @Override
     public E next() {
         last = enumeration.nextElement();
         return last;
@@ -100,9 +101,10 @@
      * If so, the first occurrence of the last returned object from this
      * iterator will be removed from the collection.
      *
-     * @exception IllegalStateException <code>next()</code> not called.
-     * @exception UnsupportedOperationException if no associated collection
+     * @throws IllegalStateException <code>next()</code> not called.
+     * @throws UnsupportedOperationException if no associated collection
      */
+    @Override
     public void remove() {
         if (collection != null) {
             if (last != null) {
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/FilterIterator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/FilterIterator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/FilterIterator.java	2013-04-30 20:01:28.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/FilterIterator.java	2018-07-08 00:18:18.000000000 +0000
@@ -28,7 +28,6 @@
  * those elements that match the specified {@link Predicate Predicate}.
  *
  * @since 1.0
- * @version $Id: FilterIterator.java 1477802 2013-04-30 20:01:28Z tn $
  */
 public class FilterIterator<E> implements Iterator<E> {
 
@@ -82,6 +81,7 @@
      * @return true if there is another object that matches the predicate
      * @throws NullPointerException if either the iterator or predicate are null
      */
+    @Override
     public boolean hasNext() {
         return nextObjectSet || setNextObject();
     }
@@ -94,11 +94,10 @@
      * @throws NoSuchElementException if there are no more elements that
      *  match the predicate
      */
+    @Override
     public E next() {
-        if (!nextObjectSet) {
-            if (!setNextObject()) {
-                throw new NoSuchElementException();
-            }
+        if (!nextObjectSet && !setNextObject()) {
+            throw new NoSuchElementException();
         }
         nextObjectSet = false;
         return nextObject;
@@ -115,6 +114,7 @@
      * @throws IllegalStateException if <code>hasNext()</code> has already
      *  been called.
      */
+    @Override
     public void remove() {
         if (nextObjectSet) {
             throw new IllegalStateException("remove() cannot be called");
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/FilterListIterator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/FilterListIterator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/FilterListIterator.java	2013-04-30 20:01:28.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/FilterListIterator.java	2018-07-08 00:18:18.000000000 +0000
@@ -28,7 +28,6 @@
  * those elements that match the specified {@link Predicate Predicate}.
  *
  * @since 2.0
- * @version $Id: FilterListIterator.java 1477802 2013-04-30 20:01:28Z tn $
  */
 public class FilterListIterator<E> implements ListIterator<E> {
 
@@ -112,24 +111,29 @@
     }
 
     //-----------------------------------------------------------------------
-    /** Not supported. */
+    /**
+     * Not supported.
+     * @param o the element to insert
+     */
+    @Override
     public void add(final E o) {
         throw new UnsupportedOperationException("FilterListIterator.add(Object) is not supported.");
     }
 
+    @Override
     public boolean hasNext() {
         return nextObjectSet || setNextObject();
     }
 
+    @Override
     public boolean hasPrevious() {
         return previousObjectSet || setPreviousObject();
     }
 
+    @Override
     public E next() {
-        if (!nextObjectSet) {
-            if (!setNextObject()) {
-                throw new NoSuchElementException();
-            }
+        if (!nextObjectSet && !setNextObject()) {
+            throw new NoSuchElementException();
         }
         nextIndex++;
         final E temp = nextObject;
@@ -137,15 +141,15 @@
         return temp;
     }
 
+    @Override
     public int nextIndex() {
         return nextIndex;
     }
 
+    @Override
     public E previous() {
-        if (!previousObjectSet) {
-            if (!setPreviousObject()) {
-                throw new NoSuchElementException();
-            }
+        if (!previousObjectSet && !setPreviousObject()) {
+            throw new NoSuchElementException();
         }
         nextIndex--;
         final E temp = previousObject;
@@ -153,16 +157,23 @@
         return temp;
     }
 
+    @Override
     public int previousIndex() {
         return nextIndex-1;
     }
 
     /** Not supported. */
+    @Override
     public void remove() {
         throw new UnsupportedOperationException("FilterListIterator.remove() is not supported.");
     }
 
-    /** Not supported. */
+    /**
+     * Not supported.
+     * @param o the element with which to replace the last element returned by
+     *          {@code next} or {@code previous}
+     */
+    @Override
     public void set(final E o) {
         throw new UnsupportedOperationException("FilterListIterator.set(Object) is not supported.");
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/IteratorChain.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/IteratorChain.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/IteratorChain.java	2013-05-14 18:36:12.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/IteratorChain.java	2018-07-08 00:18:18.000000000 +0000
@@ -46,12 +46,11 @@
  * the queue.
  *
  * @since 2.1
- * @version $Id: IteratorChain.java 1482514 2013-05-14 18:36:12Z tn $
  */
 public class IteratorChain<E> implements Iterator<E> {
 
     /** The chain of iterators */
-    private final Queue<Iterator<? extends E>> iteratorChain = new LinkedList<Iterator<? extends E>>();
+    private final Queue<Iterator<? extends E>> iteratorChain = new LinkedList<>();
 
     /** The current iterator */
     private Iterator<? extends E> currentIterator = null;
@@ -231,6 +230,7 @@
      *
      * @return true if elements remain
      */
+    @Override
     public boolean hasNext() {
         lockChain();
         updateCurrentIterator();
@@ -246,6 +246,7 @@
      * @throws java.util.NoSuchElementException if all the Iterators are
      * exhausted
      */
+    @Override
     public E next() {
         lockChain();
         updateCurrentIterator();
@@ -267,6 +268,7 @@
      * or the remove method has already been called after the last call to the
      * next method.
      */
+    @Override
     public void remove() {
         lockChain();
         if (currentIterator == null) {
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/IteratorEnumeration.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/IteratorEnumeration.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/IteratorEnumeration.java	2013-11-20 07:51:32.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/IteratorEnumeration.java	2018-07-08 00:18:18.000000000 +0000
@@ -24,7 +24,6 @@
  * {@link Enumeration Enumeration} instance.
  *
  * @since 1.0
- * @version $Id: IteratorEnumeration.java 1543728 2013-11-20 07:51:32Z ebourg $
  */
 public class IteratorEnumeration<E> implements Enumeration<E> {
 
@@ -56,6 +55,7 @@
      *
      * @return true if the underlying iterator has more elements
      */
+    @Override
     public boolean hasMoreElements() {
         return iterator.hasNext();
     }
@@ -67,6 +67,7 @@
      * @throws java.util.NoSuchElementException if the underlying iterator has
      * no more elements
      */
+    @Override
     public E nextElement() {
         return iterator.next();
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/IteratorIterable.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/IteratorIterable.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/IteratorIterable.java	2015-06-08 08:53:26.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/IteratorIterable.java	2018-07-08 00:18:18.000000000 +0000
@@ -28,11 +28,12 @@
  * operations use the same, exhausted source iterator.  To create a single use
  * iterable, construct a new {@link IteratorIterable} using a {@link Iterator}
  * that is NOT a {@link ResettableIterator} iterator:
+ * </p>
+ *
  * <pre>
- *   Iterator<Integer> iterator = // some non-resettable iterator
- *   Iterable<Integer> iterable = new IteratorIterable<Integer>(iterator);
+ *   Iterator&lt;Integer&gt; iterator = // some non-resettable iterator
+ *   Iterable&lt;Integer&gt; iterable = new IteratorIterable&lt;Integer&gt;(iterator);
  * </pre>
- * </p>
  *
  * <p>
  * In the multiple use iterable case, the iterable is usable for any number of
@@ -40,25 +41,26 @@
  * the iterable supports multiple iterations, it does not support concurrent
  * iterations. To implicitly create a multiple use iterable, construct a new
  * {@link IteratorIterable} using a {@link ResettableIterator} iterator:
+ * </p>
+ *
  * <pre>
  *   Integer[] array = {Integer.valueOf(1),Integer.valueOf(2),Integer.valueOf(3)};
- *   Iterator<Integer> iterator = IteratorUtils.arrayIterator(array); // a resettable iterator
- *   Iterable<Integer> iterable = new IteratorIterable<Integer>(iterator);
+ *   Iterator&lt;Integer&gt; iterator = IteratorUtils.arrayIterator(array); // a resettable iterator
+ *   Iterable&lt;Integer&gt; iterable = new IteratorIterable&lt;Integer&gt;(iterator);
  * </pre>
- * </p>
  *
  * <p>
  * A multiple use iterable can also be explicitly constructed using any
  * {@link Iterator} and specifying <code>true</code> for the
  * <code>multipleUse</code> flag:
+ * </p>
+ *
  * <pre>
- *   Iterator<Integer> iterator = // some non-resettable iterator
- *   Iterable<Integer> iterable = new IteratorIterable<Integer>(iterator, true);
+ *   Iterator&lt;Integer&gt; iterator = // some non-resettable iterator
+ *   Iterable&lt;Integer&gt; iterable = new IteratorIterable&lt;Integer&gt;(iterator, true);
  * </pre>
- * </p>
  *
  * @since 4.0
- * @version $Id: IteratorIterable.java 1684123 2015-06-08 08:53:26Z tn $
  */
 public class IteratorIterable<E> implements Iterable<E> {
 
@@ -68,14 +70,17 @@
      */
     private static <E> Iterator<E> createTypesafeIterator(final Iterator<? extends E> iterator) {
         return new Iterator<E>() {
+            @Override
             public boolean hasNext() {
                 return iterator.hasNext();
             }
 
+            @Override
             public E next() {
                 return iterator.next();
             }
 
+            @Override
             public void remove() {
                 iterator.remove();
             }
@@ -108,7 +113,7 @@
     public IteratorIterable(final Iterator<? extends E> iterator, final boolean multipleUse) {
         super();
         if (multipleUse && !(iterator instanceof ResettableIterator)) {
-            this.iterator = new ListIteratorWrapper<E>(iterator);
+            this.iterator = new ListIteratorWrapper<>(iterator);
         } else {
             this.iterator = iterator;
         }
@@ -120,6 +125,7 @@
      *
      * @return the iterator
      */
+    @Override
     public Iterator<E> iterator() {
         if (iterator instanceof ResettableIterator) {
             ((ResettableIterator<? extends E>)iterator).reset();
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/LazyIteratorChain.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/LazyIteratorChain.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/LazyIteratorChain.java	2013-05-13 20:09:40.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/LazyIteratorChain.java	2018-07-08 00:18:18.000000000 +0000
@@ -44,11 +44,10 @@
  * function as an empty iterator.
  *
  * @since 4.0
- * @version $Id: LazyIteratorChain.java 1482073 2013-05-13 20:09:40Z tn $
  */
 public abstract class LazyIteratorChain<E> implements Iterator<E> {
 
-    /** The number of times {@link #nextIterator()} was already called. */
+    /** The number of times {@link #next()} was already called. */
     private int callCounter = 0;
 
     /** Indicates that the Iterator chain has been exhausted. */
@@ -108,6 +107,7 @@
      *
      * @return true if elements remain
      */
+    @Override
     public boolean hasNext() {
         updateCurrentIterator();
         lastUsedIterator = currentIterator;
@@ -121,6 +121,7 @@
      * @return element from the current Iterator
      * @throws java.util.NoSuchElementException if all the Iterators are exhausted
      */
+    @Override
     public E next() {
         updateCurrentIterator();
         lastUsedIterator = currentIterator;
@@ -140,6 +141,7 @@
      * @throws IllegalStateException if the next method has not yet been called,
      *   or the remove method has already been called after the last call to the next method.
      */
+    @Override
     public void remove() {
         if (currentIterator == null) {
             updateCurrentIterator();
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/ListIteratorWrapper.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/ListIteratorWrapper.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/ListIteratorWrapper.java	2013-04-30 20:01:28.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/ListIteratorWrapper.java	2018-07-08 00:18:18.000000000 +0000
@@ -43,7 +43,6 @@
  * This class implements ResettableListIterator from Commons Collections 3.2.
  *
  * @since 2.1
- * @version $Id: ListIteratorWrapper.java 1477802 2013-04-30 20:01:28Z tn $
  */
 public class ListIteratorWrapper<E> implements ResettableListIterator<E> {
 
@@ -57,7 +56,7 @@
     /** The underlying iterator being decorated. */
     private final Iterator<? extends E> iterator;
     /** The list being used to cache the iterator. */
-    private final List<E> list = new ArrayList<E>();
+    private final List<E> list = new ArrayList<>();
 
     /** The current index of this iterator. */
     private int currentIndex = 0;
@@ -93,6 +92,7 @@
      * @throws UnsupportedOperationException if the underlying iterator is not of
      * type {@link ListIterator}
      */
+    @Override
     public void add(final E obj) throws UnsupportedOperationException {
         if (iterator instanceof ListIterator) {
             @SuppressWarnings("unchecked")
@@ -108,6 +108,7 @@
      *
      * @return true if there are more elements
      */
+    @Override
     public boolean hasNext() {
         if (currentIndex == wrappedIteratorIndex || iterator instanceof ListIterator) {
             return iterator.hasNext();
@@ -120,6 +121,7 @@
      *
      * @return true if there are previous elements
      */
+    @Override
     public boolean hasPrevious() {
         if (iterator instanceof ListIterator) {
             final ListIterator<?> li = (ListIterator<?>) iterator;
@@ -134,6 +136,7 @@
      * @return the next element from the iterator
      * @throws NoSuchElementException if there are no more elements
      */
+    @Override
     public E next() throws NoSuchElementException {
         if (iterator instanceof ListIterator) {
             return iterator.next();
@@ -157,6 +160,7 @@
      *
      * @return the index of the next element
      */
+    @Override
     public int nextIndex() {
         if (iterator instanceof ListIterator) {
             final ListIterator<?> li = (ListIterator<?>) iterator;
@@ -166,11 +170,12 @@
     }
 
     /**
-     * Returns the the previous element.
+     * Returns the previous element.
      *
      * @return the previous element
      * @throws NoSuchElementException  if there are no previous elements
      */
+    @Override
     public E previous() throws NoSuchElementException {
         if (iterator instanceof ListIterator) {
             @SuppressWarnings("unchecked")
@@ -190,6 +195,7 @@
      *
      * @return  the index of the previous element
      */
+    @Override
     public int previousIndex() {
         if (iterator instanceof ListIterator) {
             final ListIterator<?> li = (ListIterator<?>) iterator;
@@ -203,6 +209,7 @@
      *
      * @throws UnsupportedOperationException always
      */
+    @Override
     public void remove() throws UnsupportedOperationException {
         if (iterator instanceof ListIterator) {
             iterator.remove();
@@ -230,6 +237,7 @@
      * @throws UnsupportedOperationException if the underlying iterator is not of
      * type {@link ListIterator}
      */
+    @Override
     public void set(final E obj) throws UnsupportedOperationException {
         if (iterator instanceof ListIterator) {
             @SuppressWarnings("unchecked")
@@ -248,6 +256,7 @@
      *
      * @since 3.2
      */
+    @Override
     public void reset()  {
         if (iterator instanceof ListIterator) {
             final ListIterator<?> li = (ListIterator<?>) iterator;
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/LoopingIterator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/LoopingIterator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/LoopingIterator.java	2013-04-30 20:01:28.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/LoopingIterator.java	2018-07-08 00:18:18.000000000 +0000
@@ -33,7 +33,6 @@
  * implementations will throw a ConcurrentModificationException.
  *
  * @since 3.0
- * @version $Id: LoopingIterator.java 1477802 2013-04-30 20:01:28Z tn $
  */
 public class LoopingIterator<E> implements ResettableIterator<E> {
 
@@ -67,6 +66,7 @@
      *
      * @return <code>true</code> if there are more elements
      */
+    @Override
     public boolean hasNext() {
         return collection.size() > 0;
     }
@@ -80,6 +80,7 @@
      * @throws NoSuchElementException if there are no elements
      *         at all.  Use {@link #hasNext} to avoid this error.
      */
+    @Override
     public E next() {
         if (collection.size() == 0) {
             throw new NoSuchElementException("There are no elements for this iterator to loop on");
@@ -102,6 +103,7 @@
      * next has been performed. If the {@link #reset} is called, then remove may
      * not be called until {@link #next} is called again.
      */
+    @Override
     public void remove() {
         iterator.remove();
     }
@@ -109,6 +111,7 @@
     /**
      * Resets the iterator back to the start of the collection.
      */
+    @Override
     public void reset() {
         iterator = collection.iterator();
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/LoopingListIterator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/LoopingListIterator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/LoopingListIterator.java	2013-06-18 21:59:21.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/LoopingListIterator.java	2018-07-08 00:18:18.000000000 +0000
@@ -35,7 +35,6 @@
  * ConcurrentModificationException.
  *
  * @since 3.2
- * @version $Id: LoopingListIterator.java 1494333 2013-06-18 21:59:21Z sebb $
  */
 public class LoopingListIterator<E> implements ResettableListIterator<E> {
 
@@ -70,6 +69,7 @@
      *
      * @return <code>true</code> if there are more elements
      */
+    @Override
     public boolean hasNext() {
         return !list.isEmpty();
     }
@@ -82,6 +82,7 @@
      * @return the object after the last element returned
      * @throws NoSuchElementException if there are no elements in the list
      */
+    @Override
     public E next() {
         if (list.isEmpty()) {
             throw new NoSuchElementException(
@@ -104,6 +105,7 @@
      * @return the index of the element that would be returned if next() were called
      * @throws NoSuchElementException if there are no elements in the list
      */
+    @Override
     public int nextIndex() {
         if (list.isEmpty()) {
             throw new NoSuchElementException(
@@ -123,6 +125,7 @@
      *
      * @return <code>true</code> if there are more elements
      */
+    @Override
     public boolean hasPrevious() {
         return !list.isEmpty();
     }
@@ -136,6 +139,7 @@
      * @return the object before the last element returned
      * @throws NoSuchElementException if there are no elements in the list
      */
+    @Override
     public E previous() {
         if (list.isEmpty()) {
             throw new NoSuchElementException(
@@ -163,6 +167,7 @@
      * @return the index of the element that would be returned if previous() were called
      * @throws NoSuchElementException if there are no elements in the list
      */
+    @Override
     public int previousIndex() {
         if (list.isEmpty()) {
             throw new NoSuchElementException(
@@ -192,6 +197,7 @@
      * not supported by the iterator implementation of the underlying
      * list
      */
+    @Override
     public void remove() {
         iterator.remove();
     }
@@ -211,6 +217,7 @@
      * @throws UnsupportedOperationException if the add method is not
      *  supported by the iterator implementation of the underlying list
      */
+    @Override
     public void add(final E obj) {
         iterator.add(obj);
     }
@@ -227,6 +234,7 @@
      * @throws UnsupportedOperationException if the set method is not
      *  supported by the iterator implementation of the underlying list
      */
+    @Override
     public void set(final E obj) {
         iterator.set(obj);
     }
@@ -234,6 +242,7 @@
     /**
      * Resets the iterator back to the start of the list.
      */
+    @Override
     public void reset() {
         _reset();
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/NodeListIterator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/NodeListIterator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/NodeListIterator.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/NodeListIterator.java	2018-07-08 00:18:18.000000000 +0000
@@ -28,7 +28,6 @@
  * removal of items.
  *
  * @since 4.0
- * @version $Id: NodeListIterator.java 1686855 2015-06-22 13:00:27Z tn $
  * @see NodeList
  */
 public class NodeListIterator implements Iterator<Node> {
@@ -66,10 +65,12 @@
         this.nodeList = nodeList;
     }
 
+    @Override
     public boolean hasNext() {
         return nodeList == null ? false : index < nodeList.getLength();
     }
 
+    @Override
     public Node next() {
         if (nodeList != null && index < nodeList.getLength()) {
             return nodeList.item(index++);
@@ -82,6 +83,7 @@
      *
      * @throws UnsupportedOperationException always
      */
+    @Override
     public void remove() {
         throw new UnsupportedOperationException("remove() method not supported for a NodeListIterator.");
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayIterator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayIterator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayIterator.java	2013-11-20 20:15:35.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayIterator.java	2018-07-08 00:18:18.000000000 +0000
@@ -21,7 +21,7 @@
 import org.apache.commons.collections4.ResettableIterator;
 
 /**
- * An {@link Iterator} over an array of objects.
+ * An {@link java.util.Iterator Iterator} over an array of objects.
  * <p>
  * This iterator does not support {@link #remove}, as the object array cannot be
  * structurally modified.
@@ -29,8 +29,8 @@
  * The iterator implements a {@link #reset} method, allowing the reset of the iterator
  * back to the start if required.
  *
+ * @param <E> the type to iterate over
  * @since 3.0
- * @version $Id: ObjectArrayIterator.java 1543928 2013-11-20 20:15:35Z tn $
  */
 public class ObjectArrayIterator<E> implements ResettableIterator<E> {
 
@@ -107,6 +107,7 @@
      *
      * @return true if there is a next element to return
      */
+    @Override
     public boolean hasNext() {
         return this.index < this.endIndex;
     }
@@ -118,6 +119,7 @@
      * @throws NoSuchElementException if all the elements in the array
      *    have already been returned
      */
+    @Override
     public E next() {
         if (hasNext() == false) {
             throw new NoSuchElementException();
@@ -130,6 +132,7 @@
      *
      * @throws UnsupportedOperationException always
      */
+    @Override
     public void remove() {
         throw new UnsupportedOperationException("remove() method is not supported for an ObjectArrayIterator");
     }
@@ -167,6 +170,7 @@
     /**
      * Resets the iterator back to the start index.
      */
+    @Override
     public void reset() {
         this.index = this.startIndex;
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java	2013-11-20 20:15:35.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator.java	2018-07-08 00:18:18.000000000 +0000
@@ -21,7 +21,7 @@
 import org.apache.commons.collections4.ResettableListIterator;
 
 /**
- * Implements a {@link ListIterator} over an array of objects.
+ * Implements a {@link java.util.ListIterator} over an array of objects.
  * <p>
  * This iterator does not support {@link #add} or {@link #remove}, as the object array
  * cannot be structurally modified. The {@link #set} method is supported however.
@@ -34,7 +34,6 @@
  * @see java.util.ListIterator
  *
  * @since 3.0
- * @version $Id: ObjectArrayListIterator.java 1543928 2013-11-20 20:15:35Z tn $
  */
 public class ObjectArrayListIterator<E> extends ObjectArrayIterator<E>
         implements ResettableListIterator<E> {
@@ -95,6 +94,7 @@
      *
      * @return true if there is a previous element to return
      */
+    @Override
     public boolean hasPrevious() {
         return this.index > getStartIndex();
     }
@@ -105,6 +105,7 @@
      * @return the previous element
      * @throws NoSuchElementException if there is no previous element
      */
+    @Override
     public E previous() {
         if (hasPrevious() == false) {
             throw new NoSuchElementException();
@@ -133,6 +134,7 @@
      *
      * @return the index of the item to be retrieved next
      */
+    @Override
     public int nextIndex() {
         return this.index - getStartIndex();
     }
@@ -142,6 +144,7 @@
      *
      * @return the index of the item to be retrieved next
      */
+    @Override
     public int previousIndex() {
         return this.index - getStartIndex() - 1;
     }
@@ -153,6 +156,7 @@
      * @param obj  the object to add
      * @throws UnsupportedOperationException always thrown.
      */
+    @Override
     public void add(final E obj) {
         throw new UnsupportedOperationException("add() method is not supported");
     }
@@ -163,9 +167,9 @@
      * This method sets the element that was returned by the last call
      * to {@link #next()} of {@link #previous()}.
      *
-     * <b>Note:</b> {@link ListIterator} implementations that support <code>add()</code>
+     * <b>Note:</b> {@link java.util.ListIterator} implementations that support <code>add()</code>
      * and <code>remove()</code> only allow <code>set()</code> to be called once per call
-     * to <code>next()</code> or <code>previous</code> (see the {@link ListIterator}
+     * to <code>next()</code> or <code>previous</code> (see the {@link java.util.ListIterator}
      * javadoc for more details). Since this implementation does not support
      * <code>add()</code> or <code>remove()</code>, <code>set()</code> may be
      * called as often as desired.
@@ -174,6 +178,7 @@
      * @throws IllegalStateException if next() has not yet been called.
      * @throws ClassCastException if the object type is unsuitable for the array
      */
+    @Override
     public void set(final E obj) {
         if (this.lastItemIndex == -1) {
             throw new IllegalStateException("must call next() or previous() before a call to set()");
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/ObjectGraphIterator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/ObjectGraphIterator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/ObjectGraphIterator.java	2015-05-24 10:49:58.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/ObjectGraphIterator.java	2018-07-08 00:18:18.000000000 +0000
@@ -72,12 +72,11 @@
  * more efficient (and convenient) than using nested for loops to extract a list.
  *
  * @since 3.1
- * @version $Id: ObjectGraphIterator.java 1681434 2015-05-24 10:49:58Z tn $
  */
 public class ObjectGraphIterator<E> implements Iterator<E> {
 
     /** The stack of iterators */
-    private final Deque<Iterator<? extends E>> stack = new ArrayDeque<Iterator<? extends E>>(8);
+    private final Deque<Iterator<? extends E>> stack = new ArrayDeque<>(8);
     /** The root object in the tree */
     private E root;
     /** The transformer to use */
@@ -205,6 +204,7 @@
      *
      * @return true if elements remain in the iteration
      */
+    @Override
     public boolean hasNext() {
         updateCurrentIterator();
         return hasNext;
@@ -216,6 +216,7 @@
      * @return the next element from the iteration
      * @throws NoSuchElementException if all the Iterators are exhausted
      */
+    @Override
     public E next() {
         updateCurrentIterator();
         if (hasNext == false) {
@@ -241,6 +242,7 @@
      *   if the next method has not yet been called, or the remove method has
      *   already been called after the last call to the next method.
      */
+    @Override
     public void remove() {
         if (lastUsedIterator == null) {
             throw new IllegalStateException("Iterator remove() cannot be called at this time");
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/package-info.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/package-info.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/package-info.java	2013-04-30 20:01:28.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/package-info.java	2018-07-08 00:18:18.000000000 +0000
@@ -23,6 +23,5 @@
  * which is a single class that uses static methods to construct instances
  * of the classes in this package.
  *
- * @version $Id: package-info.java 1477802 2013-04-30 20:01:28Z tn $
  */
 package org.apache.commons.collections4.iterators;
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/PeekingIterator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/PeekingIterator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/PeekingIterator.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/PeekingIterator.java	2018-07-08 00:18:18.000000000 +0000
@@ -28,7 +28,6 @@
  * {@link #peek()} or {@link #element()}.
  *
  * @since 4.0
- * @version $Id: PeekingIterator.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class PeekingIterator<E> implements Iterator<E> {
 
@@ -64,7 +63,7 @@
             final PeekingIterator<E> it = (PeekingIterator<E>) iterator;
             return it;
         }
-        return new PeekingIterator<E>(iterator);
+        return new PeekingIterator<>(iterator);
     }
 
     //-----------------------------------------------------------------------
@@ -93,6 +92,7 @@
     }
 
     //-----------------------------------------------------------------------
+    @Override
     public boolean hasNext() {
         if (exhausted) {
             return false;
@@ -132,6 +132,7 @@
         return slot;
     }
 
+    @Override
     public E next() {
         if (!hasNext()) {
             throw new NoSuchElementException();
@@ -149,6 +150,7 @@
      * @throws IllegalStateException if {@link #peek()} or {@link #element()} has been called
      *   prior to the call to {@link #remove()}
      */
+    @Override
     public void remove() {
         if (slotFilled) {
             throw new IllegalStateException("peek() or element() called before remove()");
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/PermutationIterator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/PermutationIterator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/PermutationIterator.java	2013-10-20 21:12:51.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/PermutationIterator.java	2018-07-08 00:18:18.000000000 +0000
@@ -38,7 +38,6 @@
  *
  * @param <E>  the type of the objects being permuted
  *
- * @version $Id: PermutationIterator.java 1533984 2013-10-20 21:12:51Z tn $
  * @since 4.0
  */
 public class PermutationIterator<E> implements Iterator<List<E>> {
@@ -46,12 +45,12 @@
     /**
      * Permutation is done on theses keys to handle equal objects.
      */
-    private int[] keys;
+    private final int[] keys;
 
     /**
      * Mapping between keys and objects.
      */
-    private Map<Integer, E> objectMap;
+    private final Map<Integer, E> objectMap;
 
     /**
      * Direction table used in the algorithm:
@@ -60,7 +59,7 @@
      *   <li>true is right</li>
      * </ul>
      */
-    private boolean[] direction;
+    private final boolean[] direction;
 
     /**
      * Next permutation to return. When a permutation is requested
@@ -82,19 +81,20 @@
         direction = new boolean[coll.size()];
         Arrays.fill(direction, false);
         int value = 1;
-        objectMap = new HashMap<Integer, E>();
-        for (E e : coll) {
+        objectMap = new HashMap<>();
+        for (final E e : coll) {
             objectMap.put(Integer.valueOf(value), e);
             keys[value - 1] = value;
             value++;
         }
-        nextPermutation = new ArrayList<E>(coll);
+        nextPermutation = new ArrayList<>(coll);
     }
 
     /**
      * Indicates if there are more permutation available.
      * @return true if there are more permutations, otherwise false
      */
+    @Override
     public boolean hasNext() {
         return nextPermutation != null;
     }
@@ -104,6 +104,7 @@
      * @return a list of the permutator's elements representing a permutation
      * @throws NoSuchElementException if there are no more permutations
      */
+    @Override
     public List<E> next() {
         if (!hasNext()) {
             throw new NoSuchElementException();
@@ -115,14 +116,14 @@
         for (int i = 0; i < keys.length; i++) {
             if ((direction[i] && i < keys.length - 1 && keys[i] > keys[i + 1]) ||
                 (!direction[i] && i > 0 && keys[i] > keys[i - 1])) {
-                if (keys[i] > largestKey) {
+                if (keys[i] > largestKey) { // NOPMD
                     largestKey = keys[i];
                     indexOfLargestMobileInteger = i;
                 }
             }
         }
         if (largestKey == -1) {
-            List<E> toReturn = nextPermutation;
+            final List<E> toReturn = nextPermutation;
             nextPermutation = null;
             return toReturn;
         }
@@ -132,12 +133,12 @@
         final int tmpKey = keys[indexOfLargestMobileInteger];
         keys[indexOfLargestMobileInteger] = keys[indexOfLargestMobileInteger + offset];
         keys[indexOfLargestMobileInteger + offset] = tmpKey;
-        boolean tmpDirection = direction[indexOfLargestMobileInteger];
+        final boolean tmpDirection = direction[indexOfLargestMobileInteger];
         direction[indexOfLargestMobileInteger] = direction[indexOfLargestMobileInteger + offset];
         direction[indexOfLargestMobileInteger + offset] = tmpDirection;
 
         // reverse the direction of all integers larger than k and build the result
-        final List<E> nextP = new ArrayList<E>();
+        final List<E> nextP = new ArrayList<>();
         for (int i = 0; i < keys.length; i++) {
             if (keys[i] > largestKey) {
                 direction[i] = !direction[i];
@@ -149,6 +150,7 @@
         return result;
     }
 
+    @Override
     public void remove() {
         throw new UnsupportedOperationException("remove() is not supported");
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/PushbackIterator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/PushbackIterator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/PushbackIterator.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/PushbackIterator.java	2018-07-08 00:18:18.000000000 +0000
@@ -31,7 +31,6 @@
  * result in an {@link UnsupportedOperationException}.
  *
  * @since 4.0
- * @version $Id: PushbackIterator.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class PushbackIterator<E> implements Iterator<E> {
 
@@ -39,7 +38,7 @@
     private final Iterator<? extends E> iterator;
 
     /** The LIFO queue containing the pushed back items. */
-    private Deque<E> items = new ArrayDeque<E>();
+    private final Deque<E> items = new ArrayDeque<>();
 
     //-----------------------------------------------------------------------
     /**
@@ -61,7 +60,7 @@
             final PushbackIterator<E> it = (PushbackIterator<E>) iterator;
             return it;
         }
-        return new PushbackIterator<E>(iterator);
+        return new PushbackIterator<>(iterator);
     }
 
     //-----------------------------------------------------------------------
@@ -87,10 +86,12 @@
         items.push(item);
     }
 
+    @Override
     public boolean hasNext() {
         return !items.isEmpty() ? true : iterator.hasNext();
     }
 
+    @Override
     public E next() {
         return !items.isEmpty() ? items.pop() : iterator.next();
     }
@@ -100,6 +101,7 @@
      *
      * @throws UnsupportedOperationException always
      */
+    @Override
     public void remove() {
         throw new UnsupportedOperationException();
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/ReverseListIterator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/ReverseListIterator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/ReverseListIterator.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/ReverseListIterator.java	2018-07-08 00:18:18.000000000 +0000
@@ -34,7 +34,6 @@
  * continues. The previous methods work similarly.
  *
  * @since 3.2
- * @version $Id: ReverseListIterator.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class ReverseListIterator<E> implements ResettableListIterator<E> {
 
@@ -66,6 +65,7 @@
      *
      * @return true if there is another element
      */
+    @Override
     public boolean hasNext() {
         return iterator.hasPrevious();
     }
@@ -76,6 +76,7 @@
      *
      * @return the next element in the iterator
      */
+    @Override
     public E next() {
         final E obj = iterator.previous();
         validForUpdate = true;
@@ -87,6 +88,7 @@
      *
      * @return the index of the next element in the iterator
      */
+    @Override
     public int nextIndex() {
         return iterator.previousIndex();
     }
@@ -96,6 +98,7 @@
      *
      * @return true if there is a previous element
      */
+    @Override
     public boolean hasPrevious() {
         return iterator.hasNext();
     }
@@ -106,6 +109,7 @@
      *
      * @return the previous element in the iterator
      */
+    @Override
     public E previous() {
         final E obj = iterator.next();
         validForUpdate = true;
@@ -117,6 +121,7 @@
      *
      * @return the index of the previous element in the iterator
      */
+    @Override
     public int previousIndex() {
         return iterator.nextIndex();
     }
@@ -127,6 +132,7 @@
      * @throws UnsupportedOperationException if the list is unmodifiable
      * @throws IllegalStateException if there is no element to remove
      */
+    @Override
     public void remove() {
         if (validForUpdate == false) {
             throw new IllegalStateException("Cannot remove from list until next() or previous() called");
@@ -141,6 +147,7 @@
      * @throws UnsupportedOperationException if the list is unmodifiable
      * @throws IllegalStateException if the iterator is not in a valid state for set
      */
+    @Override
     public void set(final E obj) {
         if (validForUpdate == false) {
             throw new IllegalStateException("Cannot set to list until next() or previous() called");
@@ -155,6 +162,7 @@
      * @throws UnsupportedOperationException if the list is unmodifiable
      * @throws IllegalStateException if the iterator is not in a valid state for set
      */
+    @Override
     public void add(final E obj) {
         // the validForUpdate flag is needed as the necessary previous()
         // method call re-enables remove and add
@@ -170,6 +178,7 @@
      * Resets the iterator back to the start (which is the
      * end of the list as this is a reversed iterator)
      */
+    @Override
     public void reset() {
         iterator = list.listIterator(list.size());
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/SingletonIterator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/SingletonIterator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/SingletonIterator.java	2014-07-20 04:51:05.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/SingletonIterator.java	2018-07-08 00:18:18.000000000 +0000
@@ -21,11 +21,10 @@
 import org.apache.commons.collections4.ResettableIterator;
 
 /**
- * <code>SingletonIterator</code> is an {@link Iterator} over a single
+ * <code>SingletonIterator</code> is an {@link java.util.Iterator} over a single
  * object instance.
  *
  * @since 2.0
- * @version $Id: SingletonIterator.java 1612021 2014-07-20 04:51:05Z ggregory $
  */
 public class SingletonIterator<E>
         implements ResettableIterator<E> {
@@ -71,6 +70,7 @@
      *
      * @return true if the single object hasn't been returned yet
      */
+    @Override
     public boolean hasNext() {
         return beforeFirst && !removed;
     }
@@ -84,6 +84,7 @@
      * @throws NoSuchElementException if the single object has already
      *    been returned
      */
+    @Override
     public E next() {
         if (!beforeFirst || removed) {
             throw new NoSuchElementException();
@@ -101,6 +102,7 @@
      *        method.
      * @throws UnsupportedOperationException if remove is not supported
      */
+    @Override
     public void remove() {
         if (removeAllowed) {
             if (removed || beforeFirst) {
@@ -116,6 +118,7 @@
     /**
      * Reset the iterator to the start.
      */
+    @Override
     public void reset() {
         beforeFirst = true;
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/SingletonListIterator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/SingletonListIterator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/SingletonListIterator.java	2014-07-20 04:51:05.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/SingletonListIterator.java	2018-07-08 00:18:18.000000000 +0000
@@ -21,11 +21,10 @@
 import org.apache.commons.collections4.ResettableListIterator;
 
 /**
- * <code>SingletonIterator</code> is an {@link ListIterator} over a single
+ * <code>SingletonIterator</code> is an {@link java.util.ListIterator} over a single
  * object instance.
  *
  * @since 2.1
- * @version $Id: SingletonListIterator.java 1612021 2014-07-20 04:51:05Z ggregory $
  */
 public class SingletonListIterator<E> implements ResettableListIterator<E> {
 
@@ -51,6 +50,7 @@
      *
      * @return true if the single object hasn't been returned yet
      */
+    @Override
     public boolean hasNext() {
         return beforeFirst && !removed;
     }
@@ -62,6 +62,7 @@
      *
      * @return true if the single object has been returned
      */
+    @Override
     public boolean hasPrevious() {
         return !beforeFirst && !removed;
     }
@@ -72,6 +73,7 @@
      *
      * @return 0 or 1 depending on current state.
      */
+    @Override
     public int nextIndex() {
         return beforeFirst ? 0 : 1;
     }
@@ -83,6 +85,7 @@
      *
      * @return 0 or -1 depending on current state.
      */
+    @Override
     public int previousIndex() {
         return beforeFirst ? -1 : 0;
     }
@@ -96,6 +99,7 @@
      * @throws NoSuchElementException if the single object has already
      *    been returned
      */
+    @Override
     public E next() {
         if (!beforeFirst || removed) {
             throw new NoSuchElementException();
@@ -114,6 +118,7 @@
      * @throws NoSuchElementException if the single object has not already
      *    been returned
      */
+    @Override
     public E previous() {
         if (beforeFirst || removed) {
             throw new NoSuchElementException();
@@ -129,6 +134,7 @@
      *        has already been called after the last call to {@code next}
      *        or {@code previous}.
      */
+    @Override
     public void remove() {
         if(!nextCalled || removed) {
             throw new IllegalStateException();
@@ -143,6 +149,7 @@
      * @param obj  the object to add
      * @throws UnsupportedOperationException always
      */
+    @Override
     public void add(final E obj) {
         throw new UnsupportedOperationException("add() is not supported by this iterator");
     }
@@ -154,6 +161,7 @@
      * @throws IllegalStateException if {@code next} has not been called
      *          or the object has been removed
      */
+    @Override
     public void set(final E obj) {
         if (!nextCalled || removed) {
             throw new IllegalStateException();
@@ -164,6 +172,7 @@
     /**
      * Reset the iterator back to the start.
      */
+    @Override
     public void reset() {
         beforeFirst = true;
         nextCalled = false;
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/SkippingIterator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/SkippingIterator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/SkippingIterator.java	2015-06-16 20:13:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/SkippingIterator.java	2018-07-08 00:18:18.000000000 +0000
@@ -23,7 +23,6 @@
  * before that position.
  *
  * @since 4.1
- * @version $Id: SkippingIterator.java 1685902 2015-06-16 20:13:13Z tn $
  */
 public class SkippingIterator<E> extends AbstractIteratorDecorator<E> {
 
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/TransformIterator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/TransformIterator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/TransformIterator.java	2013-04-30 20:01:28.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/TransformIterator.java	2018-07-08 00:18:18.000000000 +0000
@@ -24,7 +24,6 @@
  * Decorates an iterator such that each element returned is transformed.
  *
  * @since 1.0
- * @version $Id: TransformIterator.java 1477802 2013-04-30 20:01:28Z tn $
  */
 public class TransformIterator<I, O> implements Iterator<O> {
 
@@ -70,6 +69,7 @@
     }
 
     //-----------------------------------------------------------------------
+    @Override
     public boolean hasNext() {
         return iterator.hasNext();
     }
@@ -82,10 +82,12 @@
      * @return the next object
      * @throws java.util.NoSuchElementException if there are no more elements
      */
+    @Override
     public O next() {
         return transform(iterator.next());
     }
 
+    @Override
     public void remove() {
         iterator.remove();
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/UniqueFilterIterator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/UniqueFilterIterator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/UniqueFilterIterator.java	2013-05-05 20:31:06.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/UniqueFilterIterator.java	2018-07-08 00:18:18.000000000 +0000
@@ -26,7 +26,6 @@
  * and duplicate Objects are skipped.
  *
  * @since 2.1
- * @version $Id: UniqueFilterIterator.java 1479385 2013-05-05 20:31:06Z tn $
  */
 public class UniqueFilterIterator<E> extends FilterIterator<E> {
 
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableIterator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableIterator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableIterator.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableIterator.java	2018-07-08 00:18:18.000000000 +0000
@@ -26,7 +26,6 @@
  * Attempts to modify it will result in an UnsupportedOperationException.
  *
  * @since 3.0
- * @version $Id: UnmodifiableIterator.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public final class UnmodifiableIterator<E> implements Iterator<E>, Unmodifiable {
 
@@ -53,7 +52,7 @@
             final Iterator<E> tmpIterator = (Iterator<E>) iterator;
             return tmpIterator;
         }
-        return new UnmodifiableIterator<E>(iterator);
+        return new UnmodifiableIterator<>(iterator);
     }
 
     //-----------------------------------------------------------------------
@@ -68,14 +67,17 @@
     }
 
     //-----------------------------------------------------------------------
+    @Override
     public boolean hasNext() {
         return iterator.hasNext();
     }
 
+    @Override
     public E next() {
         return iterator.next();
     }
 
+    @Override
     public void remove() {
         throw new UnsupportedOperationException("remove() is not supported");
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableListIterator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableListIterator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableListIterator.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableListIterator.java	2018-07-08 00:18:18.000000000 +0000
@@ -26,7 +26,6 @@
  * Attempts to modify it will result in an UnsupportedOperationException.
  *
  * @since 3.0
- * @version $Id: UnmodifiableListIterator.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public final class UnmodifiableListIterator<E> implements ListIterator<E>, Unmodifiable {
 
@@ -51,7 +50,7 @@
             final ListIterator<E> tmpIterator = (ListIterator<E>) iterator;
             return tmpIterator;
         }
-        return new UnmodifiableListIterator<E>(iterator);
+        return new UnmodifiableListIterator<>(iterator);
     }
 
     //-----------------------------------------------------------------------
@@ -66,38 +65,47 @@
     }
 
     //-----------------------------------------------------------------------
+    @Override
     public boolean hasNext() {
         return iterator.hasNext();
     }
 
+    @Override
     public E next() {
         return iterator.next();
     }
 
+    @Override
     public int nextIndex() {
         return iterator.nextIndex();
     }
 
+    @Override
     public boolean hasPrevious() {
         return iterator.hasPrevious();
     }
 
+    @Override
     public E previous() {
         return iterator.previous();
     }
 
+    @Override
     public int previousIndex() {
         return iterator.previousIndex();
     }
 
+    @Override
     public void remove() {
         throw new UnsupportedOperationException("remove() is not supported");
     }
 
+    @Override
     public void set(final E obj) {
         throw new UnsupportedOperationException("set() is not supported");
     }
 
+    @Override
     public void add(final E obj) {
         throw new UnsupportedOperationException("add() is not supported");
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableMapIterator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableMapIterator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableMapIterator.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableMapIterator.java	2018-07-08 00:18:18.000000000 +0000
@@ -25,7 +25,6 @@
  * Attempts to modify it will result in an UnsupportedOperationException.
  *
  * @since 3.0
- * @version $Id: UnmodifiableMapIterator.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public final class UnmodifiableMapIterator<K, V> implements MapIterator<K, V>, Unmodifiable {
 
@@ -52,7 +51,7 @@
             final MapIterator<K, V> tmpIterator = (MapIterator<K, V>) iterator;
             return tmpIterator;
         }
-        return new UnmodifiableMapIterator<K, V>(iterator);
+        return new UnmodifiableMapIterator<>(iterator);
     }
 
     //-----------------------------------------------------------------------
@@ -67,26 +66,32 @@
     }
 
     //-----------------------------------------------------------------------
+    @Override
     public boolean hasNext() {
         return iterator.hasNext();
     }
 
+    @Override
     public K next() {
         return iterator.next();
     }
 
+    @Override
     public K getKey() {
         return iterator.getKey();
     }
 
+    @Override
     public V getValue() {
         return iterator.getValue();
     }
 
+    @Override
     public V setValue(final V value) {
         throw new UnsupportedOperationException("setValue() is not supported");
     }
 
+    @Override
     public void remove() {
         throw new UnsupportedOperationException("remove() is not supported");
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIterator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIterator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIterator.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIterator.java	2018-07-08 00:18:18.000000000 +0000
@@ -25,7 +25,6 @@
  * Attempts to modify it will result in an UnsupportedOperationException.
  *
  * @since 3.0
- * @version $Id: UnmodifiableOrderedMapIterator.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public final class UnmodifiableOrderedMapIterator<K, V> implements OrderedMapIterator<K, V>,
         Unmodifiable {
@@ -54,7 +53,7 @@
             final OrderedMapIterator<K, V> tmpIterator = (OrderedMapIterator<K, V>) iterator;
             return tmpIterator;
         }
-        return new UnmodifiableOrderedMapIterator<K, V>(iterator);
+        return new UnmodifiableOrderedMapIterator<>(iterator);
     }
 
     //-----------------------------------------------------------------------
@@ -69,34 +68,42 @@
     }
 
     //-----------------------------------------------------------------------
+    @Override
     public boolean hasNext() {
         return iterator.hasNext();
     }
 
+    @Override
     public K next() {
         return iterator.next();
     }
 
+    @Override
     public boolean hasPrevious() {
         return iterator.hasPrevious();
     }
 
+    @Override
     public K previous() {
         return iterator.previous();
     }
 
+    @Override
     public K getKey() {
         return iterator.getKey();
     }
 
+    @Override
     public V getValue() {
         return iterator.getValue();
     }
 
+    @Override
     public V setValue(final V value) {
         throw new UnsupportedOperationException("setValue() is not supported");
     }
 
+    @Override
     public void remove() {
         throw new UnsupportedOperationException("remove() is not supported");
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/ZippingIterator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/ZippingIterator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/iterators/ZippingIterator.java	2015-05-28 09:58:09.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/iterators/ZippingIterator.java	2018-07-08 00:18:18.000000000 +0000
@@ -32,7 +32,6 @@
  * and {@code B.next()} until both iterators are exhausted.
  *
  * @since 4.1
- * @version $Id: ZippingIterator.java 1682196 2015-05-28 09:58:09Z tn $
  */
 public class ZippingIterator<E> implements Iterator<E> {
 
@@ -86,7 +85,7 @@
      */
     public ZippingIterator(final Iterator<? extends E>... iterators) {
         // create a mutable list to be able to remove exhausted iterators
-        final List<Iterator<? extends E>> list = new ArrayList<Iterator<? extends E>>();
+        final List<Iterator<? extends E>> list = new ArrayList<>();
         for (final Iterator<? extends E> iterator : iterators) {
             if (iterator == null) {
                 throw new NullPointerException("Iterator must not be null.");
@@ -104,6 +103,7 @@
      *
      * @return true if this iterator has remaining elements
      */
+    @Override
     public boolean hasNext() {
         // the next iterator has already been determined
         // this might happen if hasNext() is called multiple
@@ -116,10 +116,9 @@
             if (childIterator.hasNext()) {
                 nextIterator = childIterator;
                 return true;
-            } else {
-                // iterator is exhausted, remove it
-                iterators.remove();
             }
+            // iterator is exhausted, remove it
+            iterators.remove();
         }
         return false;
     }
@@ -130,6 +129,7 @@
      * @return the next interleaved element
      * @throws NoSuchElementException if no child iterator has any more elements
      */
+    @Override
     public E next() throws NoSuchElementException {
         if (!hasNext()) {
             throw new NoSuchElementException();
@@ -147,6 +147,7 @@
      * @throws IllegalStateException if there is no last returned element, or if
      *   the last returned element has already been removed
      */
+    @Override
     public void remove() {
         if (lastReturned == null) {
             throw new IllegalStateException("No value can be removed at present");
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/IteratorUtils.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/IteratorUtils.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/IteratorUtils.java	2015-11-23 21:42:01.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/IteratorUtils.java	2018-07-08 00:18:18.000000000 +0000
@@ -70,7 +70,6 @@
  * instances. The implementations are provided in the iterators subpackage.
  *
  * @since 2.1
- * @version $Id: IteratorUtils.java 1715973 2015-11-23 21:42:01Z tn $
  */
 public class IteratorUtils {
     // validation is done in this class in certain cases because the
@@ -208,7 +207,7 @@
      * @return a singleton iterator over the object
      */
     public static <E> ResettableIterator<E> singletonIterator(final E object) {
-        return new SingletonIterator<E>(object);
+        return new SingletonIterator<>(object);
     }
 
     /**
@@ -222,7 +221,7 @@
      * @return a singleton list iterator over the object
      */
     public static <E> ListIterator<E> singletonListIterator(final E object) {
-        return new SingletonListIterator<E>(object);
+        return new SingletonListIterator<>(object);
     }
 
     // Arrays
@@ -236,7 +235,7 @@
      * @throws NullPointerException if array is null
      */
     public static <E> ResettableIterator<E> arrayIterator(final E... array) {
-        return new ObjectArrayIterator<E>(array);
+        return new ObjectArrayIterator<>(array);
     }
 
     /**
@@ -252,7 +251,7 @@
      * @throws NullPointerException if array is null
      */
     public static <E> ResettableIterator<E> arrayIterator(final Object array) {
-        return new ArrayIterator<E>(array);
+        return new ArrayIterator<>(array);
     }
 
     /**
@@ -267,7 +266,7 @@
      * @throws NullPointerException if array is null
      */
     public static <E> ResettableIterator<E> arrayIterator(final E[] array, final int start) {
-        return new ObjectArrayIterator<E>(array, start);
+        return new ObjectArrayIterator<>(array, start);
     }
 
     /**
@@ -286,7 +285,7 @@
      * @throws NullPointerException if array is null
      */
     public static <E> ResettableIterator<E> arrayIterator(final Object array, final int start) {
-        return new ArrayIterator<E>(array, start);
+        return new ArrayIterator<>(array, start);
     }
 
     /**
@@ -302,7 +301,7 @@
      * @throws NullPointerException if array is null
      */
     public static <E> ResettableIterator<E> arrayIterator(final E[] array, final int start, final int end) {
-        return new ObjectArrayIterator<E>(array, start, end);
+        return new ObjectArrayIterator<>(array, start, end);
     }
 
     /**
@@ -321,7 +320,7 @@
      * @throws NullPointerException if array is null
      */
     public static <E> ResettableIterator<E> arrayIterator(final Object array, final int start, final int end) {
-        return new ArrayIterator<E>(array, start, end);
+        return new ArrayIterator<>(array, start, end);
     }
 
     //-----------------------------------------------------------------------
@@ -334,7 +333,7 @@
      * @throws NullPointerException if array is null
      */
     public static <E> ResettableListIterator<E> arrayListIterator(final E... array) {
-        return new ObjectArrayListIterator<E>(array);
+        return new ObjectArrayListIterator<>(array);
     }
 
     /**
@@ -350,7 +349,7 @@
      * @throws NullPointerException if array is null
      */
     public static <E> ResettableListIterator<E> arrayListIterator(final Object array) {
-        return new ArrayListIterator<E>(array);
+        return new ArrayListIterator<>(array);
     }
 
     /**
@@ -364,7 +363,7 @@
      * @throws NullPointerException if array is null
      */
     public static <E> ResettableListIterator<E> arrayListIterator(final E[] array, final int start) {
-        return new ObjectArrayListIterator<E>(array, start);
+        return new ObjectArrayListIterator<>(array, start);
     }
 
     /**
@@ -382,7 +381,7 @@
      * @throws NullPointerException if array is null
      */
     public static <E> ResettableListIterator<E> arrayListIterator(final Object array, final int start) {
-        return new ArrayListIterator<E>(array, start);
+        return new ArrayListIterator<>(array, start);
     }
 
     /**
@@ -398,7 +397,7 @@
      * @throws NullPointerException if array is null
      */
     public static <E> ResettableListIterator<E> arrayListIterator(final E[] array, final int start, final int end) {
-        return new ObjectArrayListIterator<E>(array, start, end);
+        return new ObjectArrayListIterator<>(array, start, end);
     }
 
     /**
@@ -417,7 +416,7 @@
      * @throws NullPointerException if array is null
      */
     public static <E> ResettableListIterator<E> arrayListIterator(final Object array, final int start, final int end) {
-        return new ArrayListIterator<E>(array, start, end);
+        return new ArrayListIterator<>(array, start, end);
     }
 
     // Bounded
@@ -434,7 +433,7 @@
      * @throws IllegalArgumentException if max is negative
      * @since 4.1
      */
-    public static <E> BoundedIterator<E> boundedIterator(final Iterator<? extends E> iterator, long max) {
+    public static <E> BoundedIterator<E> boundedIterator(final Iterator<? extends E> iterator, final long max) {
         return boundedIterator(iterator, 0, max);
     }
 
@@ -456,8 +455,8 @@
      * @since 4.1
      */
     public static <E> BoundedIterator<E> boundedIterator(final Iterator<? extends E> iterator,
-                                                         long offset, long max) {
-        return new BoundedIterator<E>(iterator, offset, max);
+                                                         final long offset, final long max) {
+        return new BoundedIterator<>(iterator, offset, max);
     }
 
     // Unmodifiable
@@ -520,7 +519,7 @@
                                                   final Iterator<? extends E> iterator2) {
         // keep a version with two iterators to avoid the following warning in client code (Java 5 & 6)
         // "A generic array of E is created for a varargs parameter"
-        return new IteratorChain<E>(iterator1, iterator2);
+        return new IteratorChain<>(iterator1, iterator2);
     }
 
     /**
@@ -533,7 +532,7 @@
      * @throws NullPointerException if iterators array is null or contains a null
      */
     public static <E> Iterator<E> chainedIterator(final Iterator<? extends E>... iterators) {
-        return new IteratorChain<E>(iterators);
+        return new IteratorChain<>(iterators);
     }
 
     /**
@@ -547,7 +546,7 @@
      * @throws ClassCastException if the iterators collection contains the wrong object type
      */
     public static <E> Iterator<E> chainedIterator(final Collection<Iterator<? extends E>> iterators) {
-        return new IteratorChain<E>(iterators);
+        return new IteratorChain<>(iterators);
     }
 
     // Collated
@@ -575,7 +574,7 @@
         @SuppressWarnings("unchecked")
         final Comparator<E> comp =
             comparator == null ? ComparatorUtils.NATURAL_COMPARATOR : (Comparator<E>) comparator;
-        return new CollatingIterator<E>(comp, iterator1, iterator2);
+        return new CollatingIterator<>(comp, iterator1, iterator2);
     }
 
     /**
@@ -599,7 +598,7 @@
         @SuppressWarnings("unchecked")
         final Comparator<E> comp =
             comparator == null ? ComparatorUtils.NATURAL_COMPARATOR : (Comparator<E>) comparator;
-        return new CollatingIterator<E>(comp, iterators);
+        return new CollatingIterator<>(comp, iterators);
     }
 
     /**
@@ -624,7 +623,7 @@
         @SuppressWarnings("unchecked")
         final Comparator<E> comp =
             comparator == null ? ComparatorUtils.NATURAL_COMPARATOR : (Comparator<E>) comparator;
-        return new CollatingIterator<E>(comp, iterators);
+        return new CollatingIterator<>(comp, iterators);
     }
 
     // Object Graph
@@ -685,7 +684,7 @@
      */
     public static <E> Iterator<E> objectGraphIterator(final E root,
             final Transformer<? super E, ? extends E> transformer) {
-        return new ObjectGraphIterator<E>(root, transformer);
+        return new ObjectGraphIterator<>(root, transformer);
     }
 
     // Transformed
@@ -712,7 +711,7 @@
         if (transform == null) {
             throw new NullPointerException("Transformer must not be null");
         }
-        return new TransformIterator<I, O>(iterator, transform);
+        return new TransformIterator<>(iterator, transform);
     }
 
     // Filtered
@@ -737,7 +736,7 @@
         if (predicate == null) {
             throw new NullPointerException("Predicate must not be null");
         }
-        return new FilterIterator<E>(iterator, predicate);
+        return new FilterIterator<>(iterator, predicate);
     }
 
     /**
@@ -761,7 +760,7 @@
         if (predicate == null) {
             throw new NullPointerException("Predicate must not be null");
         }
-        return new FilterListIterator<E>(listIterator, predicate);
+        return new FilterListIterator<>(listIterator, predicate);
     }
 
     // Looping
@@ -782,7 +781,7 @@
         if (coll == null) {
             throw new NullPointerException("Collection must not be null");
         }
-        return new LoopingIterator<E>(coll);
+        return new LoopingIterator<>(coll);
     }
 
     /**
@@ -801,7 +800,7 @@
         if (list == null) {
             throw new NullPointerException("List must not be null");
         }
-        return new LoopingListIterator<E>(list);
+        return new LoopingListIterator<>(list);
     }
 
     // org.w3c.dom.NodeList iterators
@@ -891,8 +890,8 @@
      * @throws IllegalArgumentException if offset is negative
      * @since 4.1
      */
-    public static <E> SkippingIterator<E> skippingIterator(final Iterator<E> iterator, long offset) {
-        return new SkippingIterator<E>(iterator, offset);
+    public static <E> SkippingIterator<E> skippingIterator(final Iterator<E> iterator, final long offset) {
+        return new SkippingIterator<>(iterator, offset);
     }
 
     // Zipping
@@ -909,7 +908,7 @@
      */
     public static <E> ZippingIterator<E> zippingIterator(final Iterator<? extends E> a,
                                                          final Iterator<? extends E> b) {
-        return new ZippingIterator<E>(a, b);
+        return new ZippingIterator<>(a, b);
     }
 
     /**
@@ -926,7 +925,7 @@
     public static <E> ZippingIterator<E> zippingIterator(final Iterator<? extends E> a,
                                                          final Iterator<? extends E> b,
                                                          final Iterator<? extends E> c) {
-        return new ZippingIterator<E>(a, b, c);
+        return new ZippingIterator<>(a, b, c);
     }
 
     /**
@@ -939,7 +938,7 @@
      * @since 4.1
      */
     public static <E> ZippingIterator<E> zippingIterator(final Iterator<? extends E>... iterators) {
-        return new ZippingIterator<E>(iterators);
+        return new ZippingIterator<>(iterators);
     }
 
     // Views
@@ -956,7 +955,7 @@
         if (enumeration == null) {
             throw new NullPointerException("Enumeration must not be null");
         }
-        return new EnumerationIterator<E>(enumeration);
+        return new EnumerationIterator<>(enumeration);
     }
 
     /**
@@ -977,7 +976,7 @@
         if (removeCollection == null) {
             throw new NullPointerException("Collection must not be null");
         }
-        return new EnumerationIterator<E>(enumeration, removeCollection);
+        return new EnumerationIterator<>(enumeration, removeCollection);
     }
 
     /**
@@ -992,7 +991,7 @@
         if (iterator == null) {
             throw new NullPointerException("Iterator must not be null");
         }
-        return new IteratorEnumeration<E>(iterator);
+        return new IteratorEnumeration<>(iterator);
     }
 
     /**
@@ -1008,7 +1007,7 @@
         if (iterator == null) {
             throw new NullPointerException("Iterator must not be null");
         }
-        return new IteratorIterable<E>(iterator, false);
+        return new IteratorIterable<>(iterator, false);
     }
 
     /**
@@ -1024,7 +1023,7 @@
         if (iterator == null) {
             throw new NullPointerException("Iterator must not be null");
         }
-        return new IteratorIterable<E>(iterator, true);
+        return new IteratorIterable<>(iterator, true);
     }
 
     /**
@@ -1042,7 +1041,7 @@
         if (iterator == null) {
             throw new NullPointerException("Iterator must not be null");
         }
-        return new ListIteratorWrapper<E>(iterator);
+        return new ListIteratorWrapper<>(iterator);
     }
 
     /**
@@ -1124,7 +1123,7 @@
         if (estimatedSize < 1) {
             throw new IllegalArgumentException("Estimated size must be greater than 0");
         }
-        final List<E> list = new ArrayList<E>(estimatedSize);
+        final List<E> list = new ArrayList<>(estimatedSize);
         while (iterator.hasNext()) {
             list.add(iterator.next());
         }
@@ -1163,10 +1162,10 @@
             return ((Iterable<?>) obj).iterator();
         }
         if (obj instanceof Object[]) {
-            return new ObjectArrayIterator<Object>((Object[]) obj);
+            return new ObjectArrayIterator<>((Object[]) obj);
         }
         if (obj instanceof Enumeration) {
-            return new EnumerationIterator<Object>((Enumeration<?>) obj);
+            return new EnumerationIterator<>((Enumeration<?>) obj);
         }
         if (obj instanceof Map) {
             return ((Map<?, ?>) obj).values().iterator();
@@ -1178,9 +1177,9 @@
             return new NodeListIterator((Node) obj);
         }
         if (obj instanceof Dictionary) {
-            return new EnumerationIterator<Object>(((Dictionary<?, ?>) obj).elements());
+            return new EnumerationIterator<>(((Dictionary<?, ?>) obj).elements());
         } else if (obj.getClass().isArray()) {
-            return new ArrayIterator<Object>(obj);
+            return new ArrayIterator<>(obj);
         }
         try {
             final Method method = obj.getClass().getMethod("iterator", (Class[]) null);
@@ -1414,6 +1413,26 @@
     }
 
     /**
+     * Shortcut for {@code get(iterator, 0)}.
+     * <p>
+     * Returns the <code>first</code> value in {@link Iterator}, throwing
+     * <code>IndexOutOfBoundsException</code> if there is no such element.
+     * </p>
+     * <p>
+     * The Iterator is advanced to <code>0</code> (or to the end, if
+     * <code>0</code> exceeds the number of entries) as a side effect of this method.
+     * </p>
+     * @param <E> the type of object in the {@link Iterator}
+     * @param iterator the iterator to get a value from
+     * @return the first object
+     * @throws IndexOutOfBoundsException if the request is invalid
+     * @since 4.2
+     */
+    public static <E> E first(final Iterator<E> iterator) {
+        return get(iterator, 0);
+    }
+
+    /**
      * Returns the number of elements contained in the given iterator.
      * <p>
      * A <code>null</code> or empty iterator returns {@code 0}.
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/keyvalue/AbstractKeyValue.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/keyvalue/AbstractKeyValue.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/keyvalue/AbstractKeyValue.java	2013-04-30 18:24:24.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/keyvalue/AbstractKeyValue.java	2018-07-08 00:18:18.000000000 +0000
@@ -23,7 +23,6 @@
  * and {@link java.util.Map.Entry Map.Entry} implementations.
  *
  * @since 3.0
- * @version $Id: AbstractKeyValue.java 1477753 2013-04-30 18:24:24Z tn $
  */
 public abstract class AbstractKeyValue<K, V> implements KeyValue<K, V> {
 
@@ -49,11 +48,12 @@
      *
      * @return the key
      */
+    @Override
     public K getKey() {
         return key;
     }
 
-    protected K setKey(K key) {
+    protected K setKey(final K key) {
         final K old = this.key;
         this.key = key;
         return old;
@@ -64,11 +64,12 @@
      *
      * @return the value
      */
+    @Override
     public V getValue() {
         return value;
     }
 
-    protected V setValue(V value) {
+    protected V setValue(final V value) {
         final V old = this.value;
         this.value = value;
         return old;
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryDecorator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryDecorator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryDecorator.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryDecorator.java	2018-07-08 00:18:18.000000000 +0000
@@ -25,7 +25,6 @@
  * added to a {@link java.util.Map.Entry Map.Entry}.
  *
  * @since 3.0
- * @version $Id: AbstractMapEntryDecorator.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public abstract class AbstractMapEntryDecorator<K, V> implements Map.Entry<K, V>, KeyValue<K, V> {
 
@@ -56,14 +55,17 @@
 
     //-----------------------------------------------------------------------
 
+    @Override
     public K getKey() {
         return entry.getKey();
     }
 
+    @Override
     public V getValue() {
         return entry.getValue();
     }
 
+    @Override
     public V setValue(final V object) {
         return entry.setValue(object);
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntry.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntry.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntry.java	2013-04-30 18:24:24.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntry.java	2018-07-08 00:18:18.000000000 +0000
@@ -23,7 +23,6 @@
  * {@link java.util.Map.Entry Map.Entry} implementations.
  *
  * @since 3.0
- * @version $Id: AbstractMapEntry.java 1477753 2013-04-30 18:24:24Z tn $
  */
 public abstract class AbstractMapEntry<K, V> extends AbstractKeyValue<K, V> implements Map.Entry<K, V> {
 
@@ -49,7 +48,7 @@
      * @return the previous value
      */
     @Override
-    public V setValue(final V value) {
+    public V setValue(final V value) { // NOPMD
         return super.setValue(value);
     }
 
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/keyvalue/DefaultKeyValue.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/keyvalue/DefaultKeyValue.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/keyvalue/DefaultKeyValue.java	2013-10-20 21:12:51.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/keyvalue/DefaultKeyValue.java	2018-07-08 00:18:18.000000000 +0000
@@ -28,7 +28,6 @@
  * itself as a key or value.
  *
  * @since 3.0
- * @version $Id: DefaultKeyValue.java 1533984 2013-10-20 21:12:51Z tn $
  */
 public class DefaultKeyValue<K, V> extends AbstractKeyValue<K, V> {
 
@@ -109,7 +108,7 @@
      * @return a MapEntry instance
      */
     public Map.Entry<K, V> toMapEntry() {
-        return new DefaultMapEntry<K, V>(this);
+        return new DefaultMapEntry<>(this);
     }
 
     //-----------------------------------------------------------------------
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/keyvalue/DefaultMapEntry.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/keyvalue/DefaultMapEntry.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/keyvalue/DefaultMapEntry.java	2013-10-20 21:12:51.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/keyvalue/DefaultMapEntry.java	2018-07-08 00:18:18.000000000 +0000
@@ -25,7 +25,6 @@
  * the {@link java.util.Map.Entry Map.Entry} contract from being broken.
  *
  * @since 3.0
- * @version $Id: DefaultMapEntry.java 1533984 2013-10-20 21:12:51Z tn $
  */
 public final class DefaultMapEntry<K, V> extends AbstractMapEntry<K, V> {
 
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/keyvalue/MultiKey.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/keyvalue/MultiKey.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/keyvalue/MultiKey.java	2015-09-28 08:53:44.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/keyvalue/MultiKey.java	2018-07-08 00:18:18.000000000 +0000
@@ -40,7 +40,6 @@
  * </pre>
  *
  * @since 3.0
- * @version $Id: MultiKey.java 1705620 2015-09-28 08:53:44Z tn $
  */
 public class MultiKey<K> implements Serializable {
     // This class could implement List, but that would confuse it's purpose
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/keyvalue/package-info.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/keyvalue/package-info.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/keyvalue/package-info.java	2013-04-17 17:37:03.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/keyvalue/package-info.java	2018-07-08 00:18:18.000000000 +0000
@@ -25,6 +25,5 @@
  *   <li>MultiKey - a holder of multiple keys tied together
  * </ul>
  *
- * @version $Id: package-info.java 1469004 2013-04-17 17:37:03Z tn $
  */
 package org.apache.commons.collections4.keyvalue;
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/keyvalue/TiedMapEntry.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/keyvalue/TiedMapEntry.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/keyvalue/TiedMapEntry.java	2013-04-30 18:24:24.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/keyvalue/TiedMapEntry.java	2018-07-08 00:18:18.000000000 +0000
@@ -28,7 +28,6 @@
  * map, however this will probably mess up any iterators.
  *
  * @since 3.0
- * @version $Id: TiedMapEntry.java 1477753 2013-04-30 18:24:24Z tn $
  */
 public class TiedMapEntry<K, V> implements Map.Entry<K, V>, KeyValue<K, V>, Serializable {
 
@@ -60,6 +59,7 @@
      *
      * @return the key
      */
+    @Override
     public K getKey() {
         return key;
     }
@@ -69,6 +69,7 @@
      *
      * @return the value
      */
+    @Override
     public V getValue() {
         return map.get(key);
     }
@@ -80,6 +81,7 @@
      * @return the old value
      * @throws IllegalArgumentException if the value is set to this map entry
      */
+    @Override
     public V setValue(final V value) {
         if (value == this) {
             throw new IllegalArgumentException("Cannot set value to this map entry");
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntry.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntry.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntry.java	2013-10-20 21:12:51.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntry.java	2018-07-08 00:18:18.000000000 +0000
@@ -26,7 +26,6 @@
  * UnsupportedOperationException when <code>setValue</code> is called.
  *
  * @since 3.0
- * @version $Id: UnmodifiableMapEntry.java 1533984 2013-10-20 21:12:51Z tn $
  */
 public final class UnmodifiableMapEntry<K, V> extends AbstractMapEntry<K, V> implements Unmodifiable {
 
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/KeyValue.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/KeyValue.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/KeyValue.java	2013-04-30 18:55:24.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/KeyValue.java	2018-07-08 00:18:18.000000000 +0000
@@ -26,7 +26,6 @@
  * @param <K> the type of the key
  * @param <V> the type of the value
  * @since 3.0
- * @version $Id: KeyValue.java 1477779 2013-04-30 18:55:24Z tn $
  */
 public interface KeyValue<K, V> {
 
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java	2013-06-18 20:54:29.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java	2018-07-08 00:18:18.000000000 +0000
@@ -39,7 +39,6 @@
  * is here.
  *
  * @since 3.0
- * @version $Id: AbstractLinkedList.java 1494296 2013-06-18 20:54:29Z tn $
  */
 public abstract class AbstractLinkedList<E> implements List<E> {
 
@@ -100,14 +99,17 @@
 
     //-----------------------------------------------------------------------
 
+    @Override
     public int size() {
         return size;
     }
 
+    @Override
     public boolean isEmpty() {
         return size() == 0;
     }
 
+    @Override
     public E get(final int index) {
         final Node<E> node = getNode(index, false);
         return node.getValue();
@@ -115,20 +117,24 @@
 
     //-----------------------------------------------------------------------
 
+    @Override
     public Iterator<E> iterator() {
         return listIterator();
     }
 
+    @Override
     public ListIterator<E> listIterator() {
-        return new LinkedListIterator<E>(this, 0);
+        return new LinkedListIterator<>(this, 0);
     }
 
+    @Override
     public ListIterator<E> listIterator(final int fromIndex) {
-        return new LinkedListIterator<E>(this, fromIndex);
+        return new LinkedListIterator<>(this, fromIndex);
     }
 
     //-----------------------------------------------------------------------
 
+    @Override
     public int indexOf(final Object value) {
         int i = 0;
         for (Node<E> node = header.next; node != header; node = node.next) {
@@ -140,6 +146,7 @@
         return -1;
     }
 
+    @Override
     public int lastIndexOf(final Object value) {
         int i = size - 1;
         for (Node<E> node = header.previous; node != header; node = node.previous) {
@@ -151,10 +158,12 @@
         return -1;
     }
 
+    @Override
     public boolean contains(final Object value) {
         return indexOf(value) != -1;
     }
 
+    @Override
     public boolean containsAll(final Collection<?> coll) {
         for (final Object o : coll) {
             if (!contains(o)) {
@@ -166,10 +175,12 @@
 
     //-----------------------------------------------------------------------
 
+    @Override
     public Object[] toArray() {
         return toArray(new Object[size]);
     }
 
+    @Override
     @SuppressWarnings("unchecked")
     public <T> T[] toArray(T[] array) {
         // Extend the array if needed
@@ -196,26 +207,31 @@
      * @param toIndexExclusive  the index to end at
      * @return the new sublist
      */
+    @Override
     public List<E> subList(final int fromIndexInclusive, final int toIndexExclusive) {
-        return new LinkedSubList<E>(this, fromIndexInclusive, toIndexExclusive);
+        return new LinkedSubList<>(this, fromIndexInclusive, toIndexExclusive);
     }
 
     //-----------------------------------------------------------------------
 
+    @Override
     public boolean add(final E value) {
         addLast(value);
         return true;
     }
 
+    @Override
     public void add(final int index, final E value) {
         final Node<E> node = getNode(index, true);
         addNodeBefore(node, value);
     }
 
+    @Override
     public boolean addAll(final Collection<? extends E> coll) {
         return addAll(size, coll);
     }
 
+    @Override
     public boolean addAll(final int index, final Collection<? extends E> coll) {
         final Node<E> node = getNode(index, true);
         for (final E e : coll) {
@@ -226,6 +242,7 @@
 
     //-----------------------------------------------------------------------
 
+    @Override
     public E remove(final int index) {
         final Node<E> node = getNode(index, false);
         final E oldValue = node.getValue();
@@ -233,6 +250,7 @@
         return oldValue;
     }
 
+    @Override
     public boolean remove(final Object value) {
         for (Node<E> node = header.next; node != header; node = node.next) {
             if (isEqualValue(node.getValue(), value)) {
@@ -252,6 +270,7 @@
      * <code>coll</code> that provides a fast (e.g. O(1)) implementation of
      * {@link Collection#contains(Object)}.
      */
+    @Override
     public boolean removeAll(final Collection<?> coll) {
         boolean modified = false;
         final Iterator<E> it = iterator();
@@ -275,6 +294,7 @@
      * <code>coll</code> that provides a fast (e.g. O(1)) implementation of
      * {@link Collection#contains(Object)}.
      */
+    @Override
     public boolean retainAll(final Collection<?> coll) {
         boolean modified = false;
         final Iterator<E> it = iterator();
@@ -287,6 +307,7 @@
         return modified;
     }
 
+    @Override
     public E set(final int index, final E value) {
         final Node<E> node = getNode(index, false);
         final E oldValue = node.getValue();
@@ -294,6 +315,7 @@
         return oldValue;
     }
 
+    @Override
     public void clear() {
         removeAllNodes();
     }
@@ -436,7 +458,7 @@
      * @return  newly created node
      */
     protected Node<E> createHeaderNode() {
-        return new Node<E>();
+        return new Node<>();
     }
 
     /**
@@ -448,7 +470,7 @@
      * @return a new node containing the value
      */
     protected Node<E> createNode(final E value) {
-        return new Node<E>(value);
+        return new Node<>(value);
     }
 
     /**
@@ -585,7 +607,7 @@
      * @return a new list iterator on the given sublist
      */
     protected ListIterator<E> createSubListListIterator(final LinkedSubList<E> subList, final int fromIndex) {
-        return new LinkedSubListIterator<E>(subList, fromIndex);
+        return new LinkedSubListIterator<>(subList, fromIndex);
     }
 
     //-----------------------------------------------------------------------
@@ -816,10 +838,12 @@
             return current;
         }
 
+        @Override
         public boolean hasNext() {
             return next != parent.header;
         }
 
+        @Override
         public E next() {
             checkModCount();
             if (!hasNext()) {
@@ -832,10 +856,12 @@
             return value;
         }
 
+        @Override
         public boolean hasPrevious() {
             return next.previous != parent.header;
         }
 
+        @Override
         public E previous() {
             checkModCount();
             if (!hasPrevious()) {
@@ -848,15 +874,18 @@
             return value;
         }
 
+        @Override
         public int nextIndex() {
             return nextIndex;
         }
 
+        @Override
         public int previousIndex() {
             // not normally overridden, as relative to nextIndex()
             return nextIndex() - 1;
         }
 
+        @Override
         public void remove() {
             checkModCount();
             if (current == next) {
@@ -872,11 +901,13 @@
             expectedModCount++;
         }
 
+        @Override
         public void set(final E obj) {
             checkModCount();
             getLastNodeReturned().setValue(obj);
         }
 
+        @Override
         public void add(final E obj) {
             checkModCount();
             parent.addNodeBefore(next, obj);
@@ -1048,7 +1079,7 @@
 
         @Override
         public List<E> subList(final int fromIndexInclusive, final int toIndexExclusive) {
-            return new LinkedSubList<E>(parent, fromIndexInclusive + offset, toIndexExclusive + offset);
+            return new LinkedSubList<>(parent, fromIndexInclusive + offset, toIndexExclusive + offset);
         }
 
         protected void rangeCheck(final int index, final int beyond) {
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/list/AbstractListDecorator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/list/AbstractListDecorator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/list/AbstractListDecorator.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/list/AbstractListDecorator.java	2018-07-08 00:18:18.000000000 +0000
@@ -29,7 +29,6 @@
  *
  * @param <E> the type of the elements in the list
  * @since 3.0
- * @version $Id: AbstractListDecorator.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public abstract class AbstractListDecorator<E> extends AbstractCollectionDecorator<E>
         implements List<E> {
@@ -77,42 +76,52 @@
 
     //-----------------------------------------------------------------------
 
+    @Override
     public void add(final int index, final E object) {
         decorated().add(index, object);
     }
 
+    @Override
     public boolean addAll(final int index, final Collection<? extends E> coll) {
         return decorated().addAll(index, coll);
     }
 
+    @Override
     public E get(final int index) {
         return decorated().get(index);
     }
 
+    @Override
     public int indexOf(final Object object) {
         return decorated().indexOf(object);
     }
 
+    @Override
     public int lastIndexOf(final Object object) {
         return decorated().lastIndexOf(object);
     }
 
+    @Override
     public ListIterator<E> listIterator() {
         return decorated().listIterator();
     }
 
+    @Override
     public ListIterator<E> listIterator(final int index) {
         return decorated().listIterator(index);
     }
 
+    @Override
     public E remove(final int index) {
         return decorated().remove(index);
     }
 
+    @Override
     public E set(final int index, final E object) {
         return decorated().set(index, object);
     }
 
+    @Override
     public List<E> subList(final int fromIndex, final int toIndex) {
         return decorated().subList(fromIndex, toIndex);
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/list/AbstractSerializableListDecorator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/list/AbstractSerializableListDecorator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/list/AbstractSerializableListDecorator.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/list/AbstractSerializableListDecorator.java	2018-07-08 00:18:18.000000000 +0000
@@ -26,7 +26,6 @@
  * Serializable subclass of AbstractListDecorator.
  *
  * @since 3.1
- * @version $Id: AbstractSerializableListDecorator.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public abstract class AbstractSerializableListDecorator<E>
         extends AbstractListDecorator<E> {
@@ -49,7 +48,7 @@
      * Write the list out using a custom routine.
      *
      * @param out  the output stream
-     * @throws IOException
+     * @throws IOException if an error occurs while writing to the stream
      */
     private void writeObject(final ObjectOutputStream out) throws IOException {
         out.defaultWriteObject();
@@ -60,8 +59,8 @@
      * Read the list in using a custom routine.
      *
      * @param in  the input stream
-     * @throws IOException
-     * @throws ClassNotFoundException
+     * @throws IOException if an error occurs while reading from the stream
+     * @throws ClassNotFoundException if an object read from the stream can not be loaded
      */
     @SuppressWarnings("unchecked")
     private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/list/CursorableLinkedList.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/list/CursorableLinkedList.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/list/CursorableLinkedList.java	2013-10-20 21:12:51.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/list/CursorableLinkedList.java	2018-07-08 00:18:18.000000000 +0000
@@ -53,7 +53,6 @@
  *
  * @see java.util.LinkedList
  * @since 1.0
- * @version $Id: CursorableLinkedList.java 1533984 2013-10-20 21:12:51Z tn $
  */
 public class CursorableLinkedList<E> extends AbstractLinkedList<E> implements Serializable {
 
@@ -88,7 +87,7 @@
     @Override
     protected void init() {
         super.init();
-        cursors = new ArrayList<WeakReference<Cursor<E>>>();
+        cursors = new ArrayList<>();
     }
 
     //-----------------------------------------------------------------------
@@ -202,7 +201,7 @@
      *      (index &lt; 0 || index &gt; size()).
      */
     public CursorableLinkedList.Cursor<E> cursor(final int fromIndex) {
-        final Cursor<E> cursor = new Cursor<E>(this, fromIndex);
+        final Cursor<E> cursor = new Cursor<>(this, fromIndex);
         registerCursor(cursor);
         return cursor;
     }
@@ -277,7 +276,7 @@
                 it.remove();
             }
         }
-        cursors.add(new WeakReference<Cursor<E>>(cursor));
+        cursors.add(new WeakReference<>(cursor));
     }
 
     /**
@@ -363,6 +362,9 @@
     //-----------------------------------------------------------------------
     /**
      * Serializes the data held in this object to the stream specified.
+     *
+     * @param out  the output stream
+     * @throws IOException if an error occurs while writing to the stream
      */
     private void writeObject(final ObjectOutputStream out) throws IOException {
         out.defaultWriteObject();
@@ -371,6 +373,10 @@
 
     /**
      * Deserializes the data held in this object to the stream specified.
+     *
+     * @param in  the input stream
+     * @throws IOException if an error occurs while reading from the stream
+     * @throws ClassNotFoundException if an object read from the stream can not be loaded
      */
     private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
         in.defaultReadObject();
@@ -387,7 +393,7 @@
      */
     @Override
     protected ListIterator<E> createSubListListIterator(final LinkedSubList<E> subList, final int fromIndex) {
-        final SubCursor<E> cursor = new SubCursor<E>(subList, fromIndex);
+        final SubCursor<E> cursor = new SubCursor<>(subList, fromIndex);
         registerCursor(cursor);
         return cursor;
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/list/FixedSizeList.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/list/FixedSizeList.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/list/FixedSizeList.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/list/FixedSizeList.java	2018-07-08 00:18:18.000000000 +0000
@@ -33,8 +33,8 @@
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  *
+ * @param <E> the type of elements in this collection
  * @since 3.0
- * @version $Id: FixedSizeList.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class FixedSizeList<E>
         extends AbstractSerializableListDecorator<E>
@@ -53,7 +53,7 @@
      * @since 4.0
      */
     public static <E> FixedSizeList<E> fixedSizeList(final List<E> list) {
-        return new FixedSizeList<E>(list);
+        return new FixedSizeList<>(list);
     }
 
     //-----------------------------------------------------------------------
@@ -151,7 +151,7 @@
     @Override
     public List<E> subList(final int fromIndex, final int toIndex) {
         final List<E> sub = decorated().subList(fromIndex, toIndex);
-        return new FixedSizeList<E>(sub);
+        return new FixedSizeList<>(sub);
     }
 
     /**
@@ -171,10 +171,12 @@
         }
     }
 
+    @Override
     public boolean isFull() {
         return true;
     }
 
+    @Override
     public int maxSize() {
         return size();
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/list/GrowthList.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/list/GrowthList.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/list/GrowthList.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/list/GrowthList.java	2018-07-08 00:18:18.000000000 +0000
@@ -50,7 +50,6 @@
  *
  * @see LazyList
  * @since 3.2
- * @version $Id: GrowthList.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class GrowthList<E> extends AbstractSerializableListDecorator<E> {
 
@@ -67,7 +66,7 @@
      * @since 4.0
      */
     public static <E> GrowthList<E> growthList(final List<E> list) {
-        return new GrowthList<E>(list);
+        return new GrowthList<>(list);
     }
 
     //-----------------------------------------------------------------------
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/list/LazyList.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/list/LazyList.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/list/LazyList.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/list/LazyList.java	2018-07-08 00:18:18.000000000 +0000
@@ -55,7 +55,6 @@
  *
  * @see GrowthList
  * @since 3.0
- * @version $Id: LazyList.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class LazyList<E> extends AbstractSerializableListDecorator<E> {
 
@@ -76,7 +75,7 @@
      * @since 4.0
      */
     public static <E> LazyList<E> lazyList(final List<E> list, final Factory<? extends E> factory) {
-        return new LazyList<E>(list, factory);
+        return new LazyList<>(list, factory);
     }
 
     //-----------------------------------------------------------------------
@@ -135,7 +134,7 @@
     @Override
     public List<E> subList(final int fromIndex, final int toIndex) {
         final List<E> sub = decorated().subList(fromIndex, toIndex);
-        return new LazyList<E>(sub, factory);
+        return new LazyList<>(sub, factory);
     }
 
 }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/list/NodeCachingLinkedList.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/list/NodeCachingLinkedList.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/list/NodeCachingLinkedList.java	2013-10-20 21:12:51.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/list/NodeCachingLinkedList.java	2018-07-08 00:18:18.000000000 +0000
@@ -37,7 +37,6 @@
  * <b>Note that this implementation is not synchronized.</b>
  *
  * @since 3.0
- * @version $Id: NodeCachingLinkedList.java 1533984 2013-10-20 21:12:51Z tn $
  */
 public class NodeCachingLinkedList<E> extends AbstractLinkedList<E> implements Serializable {
 
@@ -227,6 +226,9 @@
     //-----------------------------------------------------------------------
     /**
      * Serializes the data held in this object to the stream specified.
+     *
+     * @param out  the output stream
+     * @throws IOException if an error occurs while writing to the stream
      */
     private void writeObject(final ObjectOutputStream out) throws IOException {
         out.defaultWriteObject();
@@ -235,6 +237,10 @@
 
     /**
      * Deserializes the data held in this object to the stream specified.
+     *
+     * @param in  the input stream
+     * @throws IOException if an error occurs while reading from the stream
+     * @throws ClassNotFoundException if an object read from the stream can not be loaded
      */
     private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
         in.defaultReadObject();
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/list/package-info.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/list/package-info.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/list/package-info.java	2013-04-17 17:37:03.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/list/package-info.java	2018-07-08 00:18:18.000000000 +0000
@@ -35,6 +35,5 @@
  *   <li>SetUnique - a list that avoids duplicate entries like a Set</li>
  * </ul>
  *
- * @version $Id: package-info.java 1469004 2013-04-17 17:37:03Z tn $
  */
 package org.apache.commons.collections4.list;
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/list/PredicatedList.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/list/PredicatedList.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/list/PredicatedList.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/list/PredicatedList.java	2018-07-08 00:18:18.000000000 +0000
@@ -43,7 +43,6 @@
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since 3.0
- * @version $Id: PredicatedList.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class PredicatedList<E> extends PredicatedCollection<E> implements List<E> {
 
@@ -65,7 +64,7 @@
      * @since 4.0
      */
     public static <T> PredicatedList<T> predicatedList(final List<T> list, final Predicate<? super T> predicate) {
-        return new PredicatedList<T>(list, predicate);
+        return new PredicatedList<>(list, predicate);
     }
 
     //-----------------------------------------------------------------------
@@ -106,29 +105,35 @@
 
     //-----------------------------------------------------------------------
 
+    @Override
     public E get(final int index) {
         return decorated().get(index);
     }
 
+    @Override
     public int indexOf(final Object object) {
         return decorated().indexOf(object);
     }
 
+    @Override
     public int lastIndexOf(final Object object) {
         return decorated().lastIndexOf(object);
     }
 
+    @Override
     public E remove(final int index) {
         return decorated().remove(index);
     }
 
     //-----------------------------------------------------------------------
 
+    @Override
     public void add(final int index, final E object) {
         validate(object);
         decorated().add(index, object);
     }
 
+    @Override
     public boolean addAll(final int index, final Collection<? extends E> coll) {
         for (final E aColl : coll) {
             validate(aColl);
@@ -136,22 +141,26 @@
         return decorated().addAll(index, coll);
     }
 
+    @Override
     public ListIterator<E> listIterator() {
         return listIterator(0);
     }
 
+    @Override
     public ListIterator<E> listIterator(final int i) {
         return new PredicatedListIterator(decorated().listIterator(i));
     }
 
+    @Override
     public E set(final int index, final E object) {
         validate(object);
         return decorated().set(index, object);
     }
 
+    @Override
     public List<E> subList(final int fromIndex, final int toIndex) {
         final List<E> sub = decorated().subList(fromIndex, toIndex);
-        return new PredicatedList<E>(sub, predicate);
+        return new PredicatedList<>(sub, predicate);
     }
 
     /**
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/list/SetUniqueList.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/list/SetUniqueList.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/list/SetUniqueList.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/list/SetUniqueList.java	2018-07-08 00:18:18.000000000 +0000
@@ -46,7 +46,6 @@
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since 3.0
- * @version $Id: SetUniqueList.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class SetUniqueList<E> extends AbstractSerializableListDecorator<E> {
 
@@ -73,11 +72,11 @@
             throw new NullPointerException("List must not be null");
         }
         if (list.isEmpty()) {
-            return new SetUniqueList<E>(list, new HashSet<E>());
+            return new SetUniqueList<>(list, new HashSet<E>());
         }
-        final List<E> temp = new ArrayList<E>(list);
+        final List<E> temp = new ArrayList<>(list);
         list.clear();
-        final SetUniqueList<E> sl = new SetUniqueList<E>(list, new HashSet<E>());
+        final SetUniqueList<E> sl = new SetUniqueList<>(list, new HashSet<E>());
         sl.addAll(temp);
         return sl;
     }
@@ -188,7 +187,7 @@
      */
     @Override
     public boolean addAll(final int index, final Collection<? extends E> coll) {
-        final List<E> temp = new ArrayList<E>();
+        final List<E> temp = new ArrayList<>();
         for (final E e : coll) {
             if (set.add(e)) {
                 temp.add(e);
@@ -262,7 +261,7 @@
      */
     @Override
     public boolean retainAll(final Collection<?> coll) {
-        boolean result = set.retainAll(coll);
+        final boolean result = set.retainAll(coll);
         if (result == false) {
             return false;
         }
@@ -293,17 +292,17 @@
 
     @Override
     public Iterator<E> iterator() {
-        return new SetListIterator<E>(super.iterator(), set);
+        return new SetListIterator<>(super.iterator(), set);
     }
 
     @Override
     public ListIterator<E> listIterator() {
-        return new SetListListIterator<E>(super.listIterator(), set);
+        return new SetListListIterator<>(super.listIterator(), set);
     }
 
     @Override
     public ListIterator<E> listIterator(final int index) {
-        return new SetListListIterator<E>(super.listIterator(index), set);
+        return new SetListListIterator<>(super.listIterator(index), set);
     }
 
     /**
@@ -316,7 +315,7 @@
     public List<E> subList(final int fromIndex, final int toIndex) {
         final List<E> superSubList = super.subList(fromIndex, toIndex);
         final Set<E> subSet = createSetBasedOnList(set, superSubList);
-        return ListUtils.unmodifiableList(new SetUniqueList<E>(superSubList, subSet));
+        return ListUtils.unmodifiableList(new SetUniqueList<>(superSubList, subSet));
     }
 
     /**
@@ -332,14 +331,14 @@
     protected Set<E> createSetBasedOnList(final Set<E> set, final List<E> list) {
         Set<E> subSet;
         if (set.getClass().equals(HashSet.class)) {
-            subSet = new HashSet<E>(list.size());
+            subSet = new HashSet<>(list.size());
         } else {
             try {
                 subSet = set.getClass().newInstance();
             } catch (final InstantiationException ie) {
-                subSet = new HashSet<E>();
+                subSet = new HashSet<>();
             } catch (final IllegalAccessException iae) {
-                subSet = new HashSet<E>();
+                subSet = new HashSet<>();
             }
         }
         subSet.addAll(list);
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/list/TransformedList.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/list/TransformedList.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/list/TransformedList.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/list/TransformedList.java	2018-07-08 00:18:18.000000000 +0000
@@ -35,7 +35,6 @@
  * This class is Serializable from Commons Collections 3.1.
  *
  * @since 3.0
- * @version $Id: TransformedList.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class TransformedList<E> extends TransformedCollection<E> implements List<E> {
 
@@ -58,7 +57,7 @@
      */
     public static <E> TransformedList<E> transformingList(final List<E> list,
                                                           final Transformer<? super E, ? extends E> transformer) {
-        return new TransformedList<E>(list, transformer);
+        return new TransformedList<>(list, transformer);
     }
 
     /**
@@ -78,7 +77,7 @@
      */
     public static <E> TransformedList<E> transformedList(final List<E> list,
                                                          final Transformer<? super E, ? extends E> transformer) {
-        final TransformedList<E> decorated = new TransformedList<E>(list, transformer);
+        final TransformedList<E> decorated = new TransformedList<>(list, transformer);
         if (list.size() > 0) {
             @SuppressWarnings("unchecked") // list is of type E
             final E[] values = (E[]) list.toArray(); // NOPMD - false positive for generics
@@ -126,50 +125,60 @@
 
     //-----------------------------------------------------------------------
 
+    @Override
     public E get(final int index) {
         return getList().get(index);
     }
 
+    @Override
     public int indexOf(final Object object) {
         return getList().indexOf(object);
     }
 
+    @Override
     public int lastIndexOf(final Object object) {
         return getList().lastIndexOf(object);
     }
 
+    @Override
     public E remove(final int index) {
         return getList().remove(index);
     }
 
     //-----------------------------------------------------------------------
 
+    @Override
     public void add(final int index, E object) {
         object = transform(object);
         getList().add(index, object);
     }
 
+    @Override
     public boolean addAll(final int index, Collection<? extends E> coll) {
         coll = transform(coll);
         return getList().addAll(index, coll);
     }
 
+    @Override
     public ListIterator<E> listIterator() {
         return listIterator(0);
     }
 
+    @Override
     public ListIterator<E> listIterator(final int i) {
         return new TransformedListIterator(getList().listIterator(i));
     }
 
+    @Override
     public E set(final int index, E object) {
         object = transform(object);
         return getList().set(index, object);
     }
 
+    @Override
     public List<E> subList(final int fromIndex, final int toIndex) {
         final List<E> sub = getList().subList(fromIndex, toIndex);
-        return new TransformedList<E>(sub, transformer);
+        return new TransformedList<>(sub, transformer);
     }
 
     /**
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/list/TreeList.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/list/TreeList.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/list/TreeList.java	2015-05-24 10:49:58.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/list/TreeList.java	2018-07-08 00:18:18.000000000 +0000
@@ -53,7 +53,6 @@
  * does use slightly more memory.
  *
  * @since 3.1
- * @version $Id: TreeList.java 1681434 2015-05-24 10:49:58Z tn $
  */
 public class TreeList<E> extends AbstractList<E> {
 //    add; toArray; iterator; insert; get; indexOf; remove
@@ -84,7 +83,7 @@
     public TreeList(final Collection<? extends E> coll) {
         super();
         if (!coll.isEmpty()) {
-            root = new AVLNode<E>(coll);
+            root = new AVLNode<>(coll);
             size = coll.size();
         }
     }
@@ -145,7 +144,7 @@
         // override to go 75% faster
         // cannot use EmptyIterator as iterator.add() must work
         checkInterval(fromIndex, 0, size());
-        return new TreeListIterator<E>(this, fromIndex);
+        return new TreeListIterator<>(this, fromIndex);
     }
 
     /**
@@ -201,7 +200,7 @@
         modCount++;
         checkInterval(index, 0, size());
         if (root == null) {
-            root = new AVLNode<E>(index, obj, null, null);
+            root = new AVLNode<>(index, obj, null, null);
         } else {
             root = root.insert(index, obj);
         }
@@ -225,7 +224,7 @@
             return false;
         }
         modCount += c.size();
-        final AVLNode<E> cTree = new AVLNode<E>(c);
+        final AVLNode<E> cTree = new AVLNode<>(c);
         root = root == null ? cTree : root.addAll(cTree, size);
         size += c.size();
         return true;
@@ -372,7 +371,7 @@
                         final int absolutePositionOfParent, final AVLNode<E> prev, final AVLNode<E> next) {
             final int mid = start + (end - start) / 2;
             if (start < mid) {
-                left = new AVLNode<E>(iterator, start, mid - 1, mid, prev, this);
+                left = new AVLNode<>(iterator, start, mid - 1, mid, prev, this);
             } else {
                 leftIsPrevious = true;
                 left = prev;
@@ -380,7 +379,7 @@
             value = iterator.next();
             relativePosition = mid - absolutePositionOfParent;
             if (mid < end) {
-                right = new AVLNode<E>(iterator, mid + 1, end, mid, this, next);
+                right = new AVLNode<>(iterator, mid + 1, end, mid, this, next);
             } else {
                 rightIsNext = true;
                 right = next;
@@ -501,7 +500,7 @@
 
         private AVLNode<E> insertOnLeft(final int indexRelativeToMe, final E obj) {
             if (getLeftSubTree() == null) {
-                setLeft(new AVLNode<E>(-1, obj, this, left), null);
+                setLeft(new AVLNode<>(-1, obj, this, left), null);
             } else {
                 setLeft(left.insert(indexRelativeToMe, obj), null);
             }
@@ -516,7 +515,7 @@
 
         private AVLNode<E> insertOnRight(final int indexRelativeToMe, final E obj) {
             if (getRightSubTree() == null) {
-                setRight(new AVLNode<E>(+1, obj, right, this), null);
+                setRight(new AVLNode<>(+1, obj, right, this), null);
             } else {
                 setRight(right.insert(indexRelativeToMe, obj), null);
             }
@@ -623,7 +622,7 @@
             }
             if (getRightSubTree() == null) {
                 if (relativePosition > 0) {
-                    left.relativePosition += relativePosition + (relativePosition > 0 ? 0 : 1);
+                    left.relativePosition += relativePosition;
                 }
                 left.max().setRight(null, right);
                 return left;
@@ -828,7 +827,7 @@
                 // find a subtree, s, that is no taller than me. (While we are
                 // navigating left, we store the nodes we encounter in a stack
                 // so that we can re-balance them in step 4.)
-                final Deque<AVLNode<E>> sAncestors = new ArrayDeque<AVLNode<E>>();
+                final Deque<AVLNode<E>> sAncestors = new ArrayDeque<>();
                 AVLNode<E> s = otherTree;
                 int sAbsolutePosition = s.relativePosition + currentSize;
                 int sParentAbsolutePosition = 0;
@@ -868,7 +867,7 @@
             }
             otherTree = otherTree.removeMin();
 
-            final Deque<AVLNode<E>> sAncestors = new ArrayDeque<AVLNode<E>>();
+            final Deque<AVLNode<E>> sAncestors = new ArrayDeque<>();
             AVLNode<E> s = this;
             int sAbsolutePosition = s.relativePosition;
             int sParentAbsolutePosition = 0;
@@ -1034,10 +1033,12 @@
             }
         }
 
+        @Override
         public boolean hasNext() {
             return nextIndex < parent.size();
         }
 
+        @Override
         public E next() {
             checkModCount();
             if (!hasNext()) {
@@ -1053,10 +1054,12 @@
             return value;
         }
 
+        @Override
         public boolean hasPrevious() {
             return nextIndex > 0;
         }
 
+        @Override
         public E previous() {
             checkModCount();
             if (!hasPrevious()) {
@@ -1073,14 +1076,17 @@
             return value;
         }
 
+        @Override
         public int nextIndex() {
             return nextIndex;
         }
 
+        @Override
         public int previousIndex() {
             return nextIndex() - 1;
         }
 
+        @Override
         public void remove() {
             checkModCount();
             if (currentIndex == -1) {
@@ -1099,6 +1105,7 @@
             expectedModCount++;
         }
 
+        @Override
         public void set(final E obj) {
             checkModCount();
             if (current == null) {
@@ -1107,6 +1114,7 @@
             current.setValue(obj);
         }
 
+        @Override
         public void add(final E obj) {
             checkModCount();
             parent.add(nextIndex, obj);
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/list/UnmodifiableList.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/list/UnmodifiableList.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/list/UnmodifiableList.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/list/UnmodifiableList.java	2018-07-08 00:18:18.000000000 +0000
@@ -33,7 +33,6 @@
  * Attempts to modify it will result in an UnsupportedOperationException.
  *
  * @since 3.0
- * @version $Id: UnmodifiableList.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public final class UnmodifiableList<E>
         extends AbstractSerializableListDecorator<E>
@@ -57,7 +56,7 @@
             final List<E> tmpList = (List<E>) list;
             return tmpList;
         }
-        return new UnmodifiableList<E>(list);
+        return new UnmodifiableList<>(list);
     }
 
     //-----------------------------------------------------------------------
@@ -142,7 +141,7 @@
     @Override
     public List<E> subList(final int fromIndex, final int toIndex) {
         final List<E> sub = decorated().subList(fromIndex, toIndex);
-        return new UnmodifiableList<E>(sub);
+        return new UnmodifiableList<>(sub);
     }
 
 }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/ListUtils.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/ListUtils.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/ListUtils.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/ListUtils.java	2018-07-08 00:18:18.000000000 +0000
@@ -39,7 +39,6 @@
  * Provides utility methods and decorators for {@link List} instances.
  *
  * @since 1.0
- * @version $Id: ListUtils.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class ListUtils {
 
@@ -87,7 +86,7 @@
      * @throws NullPointerException if either list is null
      */
     public static <E> List<E> intersection(final List<? extends E> list1, final List<? extends E> list2) {
-        final List<E> result = new ArrayList<E>();
+        final List<E> result = new ArrayList<>();
 
         List<? extends E> smaller = list1;
         List<? extends E> larger = list2;
@@ -96,7 +95,7 @@
             larger = list1;
         }
 
-        final HashSet<E> hashSet = new HashSet<E>(smaller);
+        final HashSet<E> hashSet = new HashSet<>(smaller);
 
         for (final E e : larger) {
             if (hashSet.contains(e)) {
@@ -124,8 +123,8 @@
      * @throws NullPointerException if either list is null
      */
     public static <E> List<E> subtract(final List<E> list1, final List<? extends E> list2) {
-        final ArrayList<E> result = new ArrayList<E>();
-        final HashBag<E> bag = new HashBag<E>(list2);
+        final ArrayList<E> result = new ArrayList<>();
+        final HashBag<E> bag = new HashBag<>(list2);
         for (final E e : list1) {
             if (!bag.remove(e, 1)) {
                 result.add(e);
@@ -160,7 +159,8 @@
      * @throws NullPointerException if either list is null
      */
     public static <E> List<E> union(final List<? extends E> list1, final List<? extends E> list2) {
-        final ArrayList<E> result = new ArrayList<E>(list1);
+        final ArrayList<E> result = new ArrayList<>(list1.size() + list2.size());
+        result.addAll(list1);
         result.addAll(list2);
         return result;
     }
@@ -219,8 +219,8 @@
      * {@code true} if and only if both
      * lists have the same size, and all corresponding pairs of elements in
      * the two lists are <i>equal</i>.  (Two elements {@code e1} and
-     * {@code e2} are <i>equal</i> if <tt>(e1==null ? e2==null :
-     * e1.equals(e2))</tt>.)  In other words, two lists are defined to be
+     * {@code e2} are <i>equal</i> if <code>(e1==null ? e2==null :
+     * e1.equals(e2))</code>.)  In other words, two lists are defined to be
      * equal if they contain the same elements in the same order.  This
      * definition ensures that the equals method works properly across
      * different implementations of the {@code List} interface.
@@ -309,7 +309,7 @@
      * @since 3.2
      */
     public static <E> List<E> retainAll(final Collection<E> collection, final Collection<?> retain) {
-        final List<E> list = new ArrayList<E>(Math.min(collection.size(), retain.size()));
+        final List<E> list = new ArrayList<>(Math.min(collection.size(), retain.size()));
 
         for (final E obj : collection) {
             if (retain.contains(obj)) {
@@ -343,7 +343,7 @@
      * @since 3.2
      */
     public static <E> List<E> removeAll(final Collection<E> collection, final Collection<?> remove) {
-        final List<E> list = new ArrayList<E>();
+        final List<E> list = new ArrayList<>();
         for (final E obj : collection) {
             if (!remove.contains(obj)) {
                 list.add(obj);
@@ -545,9 +545,9 @@
           throw new NullPointerException("Equator must not be null");
         }
 
-        final SequencesComparator<E> comparator = new SequencesComparator<E>(a, b, equator);
+        final SequencesComparator<E> comparator = new SequencesComparator<>(a, b, equator);
         final EditScript<E> script = comparator.getScript();
-        final LcsVisitor<E> visitor = new LcsVisitor<E>();
+        final LcsVisitor<E> visitor = new LcsVisitor<>();
         script.visit(visitor);
         return visitor.getSubSequence();
     }
@@ -570,7 +570,7 @@
         }
         final List<Character> lcs = longestCommonSubsequence(new CharSequenceAsList( a ), new CharSequenceAsList( b ));
         final StringBuilder sb = new StringBuilder();
-        for ( Character ch : lcs ) {
+        for ( final Character ch : lcs ) {
           sb.append(ch);
         }
         return sb.toString();
@@ -580,16 +580,19 @@
      * A helper class used to construct the longest common subsequence.
      */
     private static final class LcsVisitor<E> implements CommandVisitor<E> {
-        private ArrayList<E> sequence;
+        private final ArrayList<E> sequence;
 
         public LcsVisitor() {
-            sequence = new ArrayList<E>();
+            sequence = new ArrayList<>();
         }
 
+        @Override
         public void visitInsertCommand(final E object) {}
 
+        @Override
         public void visitDeleteCommand(final E object) {}
 
+        @Override
         public void visitKeepCommand(final E object) {
             sequence.add(object);
         }
@@ -611,7 +614,7 @@
       }
 
       @Override
-      public Character get( int index ) {
+      public Character get( final int index ) {
         return Character.valueOf(sequence.charAt( index ));
       }
 
@@ -652,7 +655,7 @@
         if (size <= 0) {
             throw new IllegalArgumentException("Size must be greater than 0");
         }
-        return new Partition<T>(list, size);
+        return new Partition<>(list, size);
     }
 
     /**
@@ -671,9 +674,6 @@
         @Override
         public List<T> get(final int index) {
             final int listSize = size();
-            if (listSize < 0) {
-                throw new IllegalArgumentException("negative size: " + listSize);
-            }
             if (index < 0) {
                 throw new IndexOutOfBoundsException("Index " + index + " must not be negative");
             }
@@ -688,7 +688,7 @@
 
         @Override
         public int size() {
-            return (list.size() + size - 1) / size;
+            return (int) Math.ceil((double) list.size() / (double) size);
         }
 
         @Override
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/ListValuedMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/ListValuedMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/ListValuedMap.java	2015-06-13 18:27:11.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/ListValuedMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -27,8 +27,9 @@
  *   <li>Getting a value will return a {@link List}, holding all the values put to that key.</li>
  * </ul>
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  * @since 4.1
- * @version $Id: ListValuedMap.java 1685299 2015-06-13 18:27:11Z tn $
  */
 public interface ListValuedMap<K, V> extends MultiValuedMap<K, V> {
 
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/AbstractHashedMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/AbstractHashedMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/AbstractHashedMap.java	2015-01-02 12:32:37.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/AbstractHashedMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -52,8 +52,9 @@
  * This is to provide backwards compatibility for ReferenceMap between v3.0 and v3.1.
  * This extends clause will be removed in v5.0.
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  * @since 3.0
- * @version $Id: AbstractHashedMap.java 1649010 2015-01-02 12:32:37Z tn $
  */
 public class AbstractHashedMap<K, V> extends AbstractMap<K, V> implements IterableMap<K, V> {
 
@@ -533,7 +534,7 @@
      * @return the newly created entry
      */
     protected HashEntry<K, V> createEntry(final HashEntry<K, V> next, final int hashCode, final K key, final V value) {
-        return new HashEntry<K, V>(next, hashCode, convertKey(key), value);
+        return new HashEntry<>(next, hashCode, convertKey(key), value);
     }
 
     /**
@@ -752,11 +753,12 @@
      *
      * @return the map iterator
      */
+    @Override
     public MapIterator<K, V> mapIterator() {
         if (size == 0) {
             return EmptyMapIterator.<K, V>emptyMapIterator();
         }
-        return new HashMapIterator<K, V>(this);
+        return new HashMapIterator<>(this);
     }
 
     /**
@@ -768,10 +770,12 @@
             super(parent);
         }
 
+        @Override
         public K next() {
             return super.nextEntry().getKey();
         }
 
+        @Override
         public K getKey() {
             final HashEntry<K, V> current = currentEntry();
             if (current == null) {
@@ -780,6 +784,7 @@
             return current.getKey();
         }
 
+        @Override
         public V getValue() {
             final HashEntry<K, V> current = currentEntry();
             if (current == null) {
@@ -788,6 +793,7 @@
             return current.getValue();
         }
 
+        @Override
         public V setValue(final V value) {
             final HashEntry<K, V> current = currentEntry();
             if (current == null) {
@@ -808,7 +814,7 @@
     @Override
     public Set<Map.Entry<K, V>> entrySet() {
         if (entrySet == null) {
-            entrySet = new EntrySet<K, V>(this);
+            entrySet = new EntrySet<>(this);
         }
         return entrySet;
     }
@@ -823,7 +829,7 @@
         if (size() == 0) {
             return EmptyIterator.<Map.Entry<K, V>>emptyIterator();
         }
-        return new EntrySetIterator<K, V>(this);
+        return new EntrySetIterator<>(this);
     }
 
     /**
@@ -886,6 +892,7 @@
             super(parent);
         }
 
+        @Override
         public Map.Entry<K, V> next() {
             return super.nextEntry();
         }
@@ -902,7 +909,7 @@
     @Override
     public Set<K> keySet() {
         if (keySet == null) {
-            keySet = new KeySet<K>(this);
+            keySet = new KeySet<>(this);
         }
         return keySet;
     }
@@ -917,7 +924,7 @@
         if (size() == 0) {
             return EmptyIterator.<K>emptyIterator();
         }
-        return new KeySetIterator<K>(this);
+        return new KeySetIterator<>(this);
     }
 
     /**
@@ -970,6 +977,7 @@
             super((AbstractHashedMap<K, Object>) parent);
         }
 
+        @Override
         public K next() {
             return super.nextEntry().getKey();
         }
@@ -986,7 +994,7 @@
     @Override
     public Collection<V> values() {
         if (values == null) {
-            values = new Values<V>(this);
+            values = new Values<>(this);
         }
         return values;
     }
@@ -1001,7 +1009,7 @@
         if (size() == 0) {
             return EmptyIterator.<V>emptyIterator();
         }
-        return new ValuesIterator<V>(this);
+        return new ValuesIterator<>(this);
     }
 
     /**
@@ -1047,6 +1055,7 @@
             super((AbstractHashedMap<Object, V>) parent);
         }
 
+        @Override
         public V next() {
             return super.nextEntry().getValue();
         }
@@ -1079,6 +1088,7 @@
             this.value = value;
         }
 
+        @Override
         @SuppressWarnings("unchecked")
         public K getKey() {
             if (key == NULL) {
@@ -1087,11 +1097,13 @@
             return (K) key;
         }
 
+        @Override
         @SuppressWarnings("unchecked")
         public V getValue() {
             return (V) value;
         }
 
+        @Override
         @SuppressWarnings("unchecked")
         public V setValue(final V value) {
             final Object old = this.value;
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/AbstractInputCheckedMapDecorator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/AbstractInputCheckedMapDecorator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/AbstractInputCheckedMapDecorator.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/AbstractInputCheckedMapDecorator.java	2018-07-08 00:18:18.000000000 +0000
@@ -30,17 +30,19 @@
  * <p>
  * The Map API is very difficult to decorate correctly, and involves implementing
  * lots of different classes. This class exists to provide a simpler API.
+ * </p>
  * <p>
  * Special hook methods are provided that are called when objects are added to
  * the map. By overriding these methods, the input can be validated or manipulated.
  * In addition to the main map methods, the entrySet is also affected, which is
  * the hardest part of writing map implementations.
+ * </p>
  * <p>
  * This class is package-scoped, and may be withdrawn or replaced in future
  * versions of Commons Collections.
+ * </p>
  *
  * @since 3.1
- * @version $Id: AbstractInputCheckedMapDecorator.java 1686855 2015-06-22 13:00:27Z tn $
  */
 abstract class AbstractInputCheckedMapDecorator<K, V>
         extends AbstractMapDecorator<K, V> {
@@ -68,10 +70,13 @@
      * <p>
      * An implementation may validate the value and throw an exception
      * or it may transform the value into another object.
+     * </p>
      * <p>
      * This implementation returns the input value.
+     * </p>
      *
      * @param value  the value to check
+     * @return the input value
      * @throws UnsupportedOperationException if the map may not be changed by setValue
      * @throws IllegalArgumentException if the specified value is invalid
      * @throws ClassCastException if the class of the specified value is invalid
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/AbstractIterableMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/AbstractIterableMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/AbstractIterableMap.java	2013-04-17 17:37:03.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/AbstractIterableMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -22,15 +22,17 @@
 /**
  * Provide a basic {@link IterableMap} implementation.
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  * @since 4.0
- * @version $Id: AbstractIterableMap.java 1469004 2013-04-17 17:37:03Z tn $
  */
 public abstract class AbstractIterableMap<K, V> implements IterableMap<K, V> {
 
     /**
      * {@inheritDoc}
      */
+    @Override
     public MapIterator<K, V> mapIterator() {
-        return new EntrySetToMapIteratorAdapter<K, V>(entrySet());
+        return new EntrySetToMapIteratorAdapter<>(entrySet());
     }
 }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/AbstractLinkedMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/AbstractLinkedMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/AbstractLinkedMap.java	2013-10-20 21:12:51.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/AbstractLinkedMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -56,8 +56,9 @@
  * The implementation is also designed to be subclassed, with lots of useful
  * methods exposed.
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  * @since 3.0
- * @version $Id: AbstractLinkedMap.java 1533984 2013-10-20 21:12:51Z tn $
  */
 public abstract class AbstractLinkedMap<K, V> extends AbstractHashedMap<K, V> implements OrderedMap<K, V> {
 
@@ -75,7 +76,7 @@
      * Constructor which performs no validation on the passed in parameters.
      *
      * @param initialCapacity  the initial capacity, must be a power of two
-     * @param loadFactor  the load factor, must be > 0.0f and generally < 1.0f
+     * @param loadFactor  the load factor, must be &gt; 0.0f and generally &lt; 1.0f
      * @param threshold  the threshold, must be sensible
      */
     protected AbstractLinkedMap(final int initialCapacity, final float loadFactor, final int threshold) {
@@ -171,6 +172,7 @@
      *
      * @return the eldest key
      */
+    @Override
     public K firstKey() {
         if (size == 0) {
             throw new NoSuchElementException("Map is empty");
@@ -183,6 +185,7 @@
      *
      * @return the most recently inserted key
      */
+    @Override
     public K lastKey() {
         if (size == 0) {
             throw new NoSuchElementException("Map is empty");
@@ -196,6 +199,7 @@
      * @param key  the key to get after
      * @return the next key
      */
+    @Override
     public K nextKey(final Object key) {
         final LinkEntry<K, V> entry = getEntry(key);
         return entry == null || entry.after == header ? null : entry.after.getKey();
@@ -212,6 +216,7 @@
      * @param key  the key to get before
      * @return the previous key
      */
+    @Override
     public K previousKey(final Object key) {
         final LinkEntry<K, V> entry = getEntry(key);
         return entry == null || entry.before == header ? null : entry.before.getKey();
@@ -281,7 +286,7 @@
      */
     @Override
     protected LinkEntry<K, V> createEntry(final HashEntry<K, V> next, final int hashCode, final K key, final V value) {
-        return new LinkEntry<K, V>(next, hashCode, convertKey(key), value);
+        return new LinkEntry<>(next, hashCode, convertKey(key), value);
     }
 
     /**
@@ -340,7 +345,7 @@
         if (size == 0) {
             return EmptyOrderedMapIterator.<K, V>emptyOrderedMapIterator();
         }
-        return new LinkMapIterator<K, V>(this);
+        return new LinkMapIterator<>(this);
     }
 
     /**
@@ -353,14 +358,17 @@
             super(parent);
         }
 
+        @Override
         public K next() {
             return super.nextEntry().getKey();
         }
 
+        @Override
         public K previous() {
             return super.previousEntry().getKey();
         }
 
+        @Override
         public K getKey() {
             final LinkEntry<K, V> current = currentEntry();
             if (current == null) {
@@ -369,6 +377,7 @@
             return current.getKey();
         }
 
+        @Override
         public V getValue() {
             final LinkEntry<K, V> current = currentEntry();
             if (current == null) {
@@ -377,6 +386,7 @@
             return current.getValue();
         }
 
+        @Override
         public V setValue(final V value) {
             final LinkEntry<K, V> current = currentEntry();
             if (current == null) {
@@ -398,7 +408,7 @@
         if (size() == 0) {
             return EmptyOrderedIterator.<Map.Entry<K, V>>emptyOrderedIterator();
         }
-        return new EntrySetIterator<K, V>(this);
+        return new EntrySetIterator<>(this);
     }
 
     /**
@@ -411,10 +421,12 @@
             super(parent);
         }
 
+        @Override
         public Map.Entry<K, V> next() {
             return super.nextEntry();
         }
 
+        @Override
         public Map.Entry<K, V> previous() {
             return super.previousEntry();
         }
@@ -432,7 +444,7 @@
         if (size() == 0) {
             return EmptyOrderedIterator.<K>emptyOrderedIterator();
         }
-        return new KeySetIterator<K>(this);
+        return new KeySetIterator<>(this);
     }
 
     /**
@@ -446,10 +458,12 @@
             super((AbstractLinkedMap<K, Object>) parent);
         }
 
+        @Override
         public K next() {
             return super.nextEntry().getKey();
         }
 
+        @Override
         public K previous() {
             return super.previousEntry().getKey();
         }
@@ -467,7 +481,7 @@
         if (size() == 0) {
             return EmptyOrderedIterator.<V>emptyOrderedIterator();
         }
-        return new ValuesIterator<V>(this);
+        return new ValuesIterator<>(this);
     }
 
     /**
@@ -481,10 +495,12 @@
             super((AbstractLinkedMap<Object, V>) parent);
         }
 
+        @Override
         public V next() {
             return super.nextEntry().getValue();
         }
 
+        @Override
         public V previous() {
             return super.previousEntry().getValue();
         }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/AbstractMapDecorator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/AbstractMapDecorator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/AbstractMapDecorator.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/AbstractMapDecorator.java	2018-07-08 00:18:18.000000000 +0000
@@ -36,7 +36,6 @@
  * @param <K> the type of the keys in the map
  * @param <V> the type of the values in the map
  * @since 3.0
- * @version $Id: AbstractMapDecorator.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public abstract class AbstractMapDecorator<K, V> extends AbstractIterableMap<K, V> {
 
@@ -74,50 +73,62 @@
     }
 
     //-----------------------------------------------------------------------
+    @Override
     public void clear() {
         decorated().clear();
     }
 
+    @Override
     public boolean containsKey(final Object key) {
         return decorated().containsKey(key);
     }
 
+    @Override
     public boolean containsValue(final Object value) {
         return decorated().containsValue(value);
     }
 
+    @Override
     public Set<Map.Entry<K, V>> entrySet() {
         return decorated().entrySet();
     }
 
+    @Override
     public V get(final Object key) {
         return decorated().get(key);
     }
 
+    @Override
     public boolean isEmpty() {
         return decorated().isEmpty();
     }
 
+    @Override
     public Set<K> keySet() {
         return decorated().keySet();
     }
 
+    @Override
     public V put(final K key, final V value) {
         return decorated().put(key, value);
     }
 
+    @Override
     public void putAll(final Map<? extends K, ? extends V> mapToCopy) {
         decorated().putAll(mapToCopy);
     }
 
+    @Override
     public V remove(final Object key) {
         return decorated().remove(key);
     }
 
+    @Override
     public int size() {
         return decorated().size();
     }
 
+    @Override
     public Collection<V> values() {
         return decorated().values();
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/AbstractOrderedMapDecorator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/AbstractOrderedMapDecorator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/AbstractOrderedMapDecorator.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/AbstractOrderedMapDecorator.java	2018-07-08 00:18:18.000000000 +0000
@@ -31,8 +31,9 @@
  * it would provide a loophole around the validation.
  * But, you might want that loophole, so this class is kept simple.
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  * @since 3.0
- * @version $Id: AbstractOrderedMapDecorator.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public abstract class AbstractOrderedMapDecorator<K, V> extends AbstractMapDecorator<K, V>
         implements OrderedMap<K, V> {
@@ -66,18 +67,22 @@
     }
 
     //-----------------------------------------------------------------------
+    @Override
     public K firstKey() {
         return decorated().firstKey();
     }
 
+    @Override
     public K lastKey() {
         return decorated().lastKey();
     }
 
+    @Override
     public K nextKey(final K key) {
         return decorated().nextKey(key);
     }
 
+    @Override
     public K previousKey(final K key) {
         return decorated().previousKey(key);
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java	2013-04-30 19:56:11.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -75,16 +75,18 @@
  * You can use {@link java.util.Collections#synchronizedMap} to
  * provide synchronized access to a <code>ReferenceMap</code>.
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
+ *
  * @see java.lang.ref.Reference
  * @since 3.1 (extracted from ReferenceMap in 3.0)
- * @version $Id: AbstractReferenceMap.java 1477799 2013-04-30 19:56:11Z tn $
  */
 public abstract class AbstractReferenceMap<K, V> extends AbstractHashedMap<K, V> {
 
     /**
      * Reference type enum.
      */
-    public static enum ReferenceStrength {
+    public enum ReferenceStrength {
         HARD(0), SOFT(1), WEAK(2);
 
         /** value */
@@ -175,7 +177,7 @@
      */
     @Override
     protected void init() {
-        queue = new ReferenceQueue<Object>();
+        queue = new ReferenceQueue<>();
     }
 
     //-----------------------------------------------------------------------
@@ -292,7 +294,8 @@
     @Override
     public void clear() {
         super.clear();
-        while (queue.poll() != null) {} // drain the queue
+        // drain the queue
+        while (queue.poll() != null) {} // NOPMD
     }
 
     //-----------------------------------------------------------------------
@@ -304,7 +307,7 @@
      */
     @Override
     public MapIterator<K, V> mapIterator() {
-        return new ReferenceMapIterator<K, V>(this);
+        return new ReferenceMapIterator<>(this);
     }
 
     /**
@@ -317,7 +320,7 @@
     @Override
     public Set<Map.Entry<K, V>> entrySet() {
         if (entrySet == null) {
-            entrySet = new ReferenceEntrySet<K, V>(this);
+            entrySet = new ReferenceEntrySet<>(this);
         }
         return entrySet;
     }
@@ -330,7 +333,7 @@
     @Override
     public Set<K> keySet() {
         if (keySet == null) {
-            keySet = new ReferenceKeySet<K>(this);
+            keySet = new ReferenceKeySet<>(this);
         }
         return keySet;
     }
@@ -343,7 +346,7 @@
     @Override
     public Collection<V> values() {
         if (values == null) {
-            values = new ReferenceValues<V>(this);
+            values = new ReferenceValues<>(this);
         }
         return values;
     }
@@ -469,7 +472,7 @@
     @Override
     protected ReferenceEntry<K, V> createEntry(final HashEntry<K, V> next, final int hashCode,
                                                final K key, final V value) {
-        return new ReferenceEntry<K, V>(this, next, hashCode, key, value);
+        return new ReferenceEntry<>(this, next, hashCode, key, value);
     }
 
     /**
@@ -479,7 +482,7 @@
      */
     @Override
     protected Iterator<Map.Entry<K, V>> createEntrySetIterator() {
-        return new ReferenceEntrySetIterator<K, V>(this);
+        return new ReferenceEntrySetIterator<>(this);
     }
 
     /**
@@ -489,7 +492,7 @@
      */
     @Override
     protected Iterator<K> createKeySetIterator() {
-        return new ReferenceKeySetIterator<K>(this);
+        return new ReferenceKeySetIterator<>(this);
     }
 
     /**
@@ -499,7 +502,7 @@
      */
     @Override
     protected Iterator<V> createValuesIterator() {
-        return new ReferenceValuesIterator<V>(this);
+        return new ReferenceValuesIterator<>(this);
     }
 
     //-----------------------------------------------------------------------
@@ -520,9 +523,9 @@
         @Override
         public <T> T[] toArray(final T[] arr) {
             // special implementation to handle disappearing entries
-            final ArrayList<Map.Entry<K, V>> list = new ArrayList<Map.Entry<K, V>>(size());
+            final ArrayList<Map.Entry<K, V>> list = new ArrayList<>(size());
             for (final Map.Entry<K, V> entry : this) {
-                list.add(new DefaultMapEntry<K, V>(entry));
+                list.add(new DefaultMapEntry<>(entry));
             }
             return list.toArray(arr);
         }
@@ -546,7 +549,7 @@
         @Override
         public <T> T[] toArray(final T[] arr) {
             // special implementation to handle disappearing keys
-            final List<K> list = new ArrayList<K>(size());
+            final List<K> list = new ArrayList<>(size());
             for (final K key : this) {
                 list.add(key);
             }
@@ -572,7 +575,7 @@
         @Override
         public <T> T[] toArray(final T[] arr) {
             // special implementation to handle disappearing values
-            final List<V> list = new ArrayList<V>(size());
+            final List<V> list = new ArrayList<>(size());
             for (final V value : this) {
                 list.add(value);
             }
@@ -710,10 +713,10 @@
                 return referent;
             }
             if (type == ReferenceStrength.SOFT) {
-                return new SoftRef<T>(hash, referent, parent.queue);
+                return new SoftRef<>(hash, referent, parent.queue);
             }
             if (type == ReferenceStrength.WEAK) {
-                return new WeakRef<T>(hash, referent, parent.queue);
+                return new WeakRef<>(hash, referent, parent.queue);
             }
             throw new Error();
         }
@@ -856,6 +859,7 @@
             super(parent);
         }
 
+        @Override
         public Map.Entry<K, V> next() {
             return nextEntry();
         }
@@ -872,6 +876,7 @@
             super((AbstractReferenceMap<K, Object>) parent);
         }
 
+        @Override
         public K next() {
             return nextEntry().getKey();
         }
@@ -887,6 +892,7 @@
             super((AbstractReferenceMap<Object, V>) parent);
         }
 
+        @Override
         public V next() {
             return nextEntry().getValue();
         }
@@ -901,10 +907,12 @@
             super(parent);
         }
 
+        @Override
         public K next() {
             return nextEntry().getKey();
         }
 
+        @Override
         public K getKey() {
             final HashEntry<K, V> current = currentEntry();
             if (current == null) {
@@ -913,6 +921,7 @@
             return current.getKey();
         }
 
+        @Override
         public V getValue() {
             final HashEntry<K, V> current = currentEntry();
             if (current == null) {
@@ -921,6 +930,7 @@
             return current.getValue();
         }
 
+        @Override
         public V setValue(final V value) {
             final HashEntry<K, V> current = currentEntry();
             if (current == null) {
@@ -1035,6 +1045,15 @@
         final int capacity = in.readInt();
         init();
         data = new HashEntry[capacity];
+
+        // COLLECTIONS-599: Calculate threshold before populating, otherwise it will be 0
+        // when it hits AbstractHashedMap.checkCapacity() and so will unnecessarily
+        // double up the size of the "data" array during population.
+        //
+        // NB: AbstractHashedMap.doReadObject() DOES calculate the threshold before populating.
+        //
+        threshold = calculateThreshold(data.length, loadFactor);
+
         while (true) {
             final K key = (K) in.readObject();
             if (key == null) {
@@ -1043,7 +1062,6 @@
             final V value = (V) in.readObject();
             put(key, value);
         }
-        threshold = calculateThreshold(data.length, loadFactor);
         // do not call super.doReadObject() as code there doesn't work for reference map
     }
 
@@ -1052,7 +1070,7 @@
      * @param type the type to check against.
      * @return true if keyType has the specified type
      */
-    protected boolean isKeyType(ReferenceStrength type) {
+    protected boolean isKeyType(final ReferenceStrength type) {
         return this.keyType == type;
     }
 }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/AbstractSortedMapDecorator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/AbstractSortedMapDecorator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/AbstractSortedMapDecorator.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/AbstractSortedMapDecorator.java	2018-07-08 00:18:18.000000000 +0000
@@ -42,7 +42,6 @@
  * @param <K> the type of the keys in the map
  * @param <V> the type of the values in the map
  * @since 3.0
- * @version $Id: AbstractSortedMapDecorator.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public abstract class AbstractSortedMapDecorator<K, V> extends AbstractMapDecorator<K, V> implements
         IterableSortedMap<K, V> {
@@ -76,35 +75,43 @@
     }
 
     //-----------------------------------------------------------------------
+    @Override
     public Comparator<? super K> comparator() {
         return decorated().comparator();
     }
 
+    @Override
     public K firstKey() {
         return decorated().firstKey();
     }
 
+    @Override
     public K lastKey() {
         return decorated().lastKey();
     }
 
+    @Override
     public SortedMap<K, V> subMap(final K fromKey, final K toKey) {
         return decorated().subMap(fromKey, toKey);
     }
 
+    @Override
     public SortedMap<K, V> headMap(final K toKey) {
         return decorated().headMap(toKey);
     }
 
+    @Override
     public SortedMap<K, V> tailMap(final K fromKey) {
         return decorated().tailMap(fromKey);
     }
 
+    @Override
     public K previousKey(final K key) {
         final SortedMap<K, V> headMap = headMap(key);
         return headMap.isEmpty() ? null : headMap.lastKey();
     }
 
+    @Override
     public K nextKey(final K key) {
         final Iterator<K> it = tailMap(key).keySet().iterator();
         it.next();
@@ -116,7 +123,7 @@
      */
     @Override
     public OrderedMapIterator<K, V> mapIterator() {
-        return new SortedMapIterator<K, V>(entrySet());
+        return new SortedMapIterator<>(entrySet());
     }
 
     /**
@@ -142,12 +149,13 @@
         @Override
         public synchronized void reset() {
             super.reset();
-            iterator = new ListIteratorWrapper<Map.Entry<K, V>>(iterator);
+            iterator = new ListIteratorWrapper<>(iterator);
         }
 
         /**
          * {@inheritDoc}
          */
+        @Override
         public boolean hasPrevious() {
             return ((ListIterator<Map.Entry<K, V>>) iterator).hasPrevious();
         }
@@ -155,6 +163,7 @@
         /**
          * {@inheritDoc}
          */
+        @Override
         public K previous() {
             entry = ((ListIterator<Map.Entry<K, V>>) iterator).previous();
             return getKey();
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/CaseInsensitiveMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/CaseInsensitiveMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/CaseInsensitiveMap.java	2013-10-20 21:12:51.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/CaseInsensitiveMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -46,19 +46,22 @@
  * returns <code>"Four".</code>  The <code>Set</code> returned by <code>keySet()</code>
  * equals <code>{"one", "two", null}.</code>
  * <p>
- * <strong>This map will violate the detail of various Map and map view contracts.</note>
+ * <strong>This map will violate the detail of various Map and map view contracts.</strong>
  * As a general rule, don't compare this map to other maps. In particular, you can't
  * use decorators like {@link ListOrderedMap} on it, which silently assume that these
  * contracts are fulfilled.
+ * </p>
  * <p>
  * <strong>Note that CaseInsensitiveMap is not synchronized and is not thread-safe.</strong>
  * If you wish to use this map from multiple threads concurrently, you must use
  * appropriate synchronization. The simplest approach is to wrap this map
  * using {@link java.util.Collections#synchronizedMap(Map)}. This class may throw
  * exceptions when accessed by concurrent threads without synchronization.
+ * </p>
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  * @since 3.0
- * @version $Id: CaseInsensitiveMap.java 1533984 2013-10-20 21:12:51Z tn $
  */
 public class CaseInsensitiveMap<K, V> extends AbstractHashedMap<K, V> implements Serializable, Cloneable {
 
@@ -144,6 +147,9 @@
 
     /**
      * Write the map out using a custom routine.
+     *
+     * @param out  the output stream
+     * @throws IOException if an error occurs while writing to the stream
      */
     private void writeObject(final ObjectOutputStream out) throws IOException {
         out.defaultWriteObject();
@@ -152,6 +158,10 @@
 
     /**
      * Read the map in using a custom routine.
+     *
+     * @param in the input stream
+     * @throws IOException if an error occurs while reading from the stream
+     * @throws ClassNotFoundException if an object read from the stream can not be loaded
      */
     private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
         in.defaultReadObject();
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/CompositeMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/CompositeMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/CompositeMap.java	2014-07-20 04:51:05.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/CompositeMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -39,8 +39,9 @@
  * using {@link java.util.Collections#synchronizedMap(Map)}. This class may throw
  * exceptions when accessed by concurrent threads without synchronization.
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  * @since 3.0
- * @version $Id: CompositeMap.java 1612021 2014-07-20 04:51:05Z ggregory $
  */
 public class CompositeMap<K, V> extends AbstractIterableMap<K, V> implements Serializable {
 
@@ -173,6 +174,7 @@
      *
      * @throws UnsupportedOperationException if any of the composited Maps do not support clear()
      */
+    @Override
     public void clear() {
         for (int i = this.composite.length - 1; i >= 0; --i) {
             this.composite[i].clear();
@@ -195,6 +197,7 @@
      * @throws NullPointerException if the key is {@code null} and this map
      *            does not not permit {@code null} keys (optional).
      */
+    @Override
     public boolean containsKey(final Object key) {
         for (int i = this.composite.length - 1; i >= 0; --i) {
             if (this.composite[i].containsKey(key)) {
@@ -220,6 +223,7 @@
      * @throws NullPointerException if the value is {@code null} and this map
      *            does not not permit {@code null} values (optional).
      */
+    @Override
     public boolean containsValue(final Object value) {
         for (int i = this.composite.length - 1; i >= 0; --i) {
             if (this.composite[i].containsValue(value)) {
@@ -246,8 +250,9 @@
      * @see CompositeSet
      * @return a set view of the mappings contained in this map.
      */
+    @Override
     public Set<Map.Entry<K, V>> entrySet() {
-        final CompositeSet<Map.Entry<K, V>> entries = new CompositeSet<Map.Entry<K,V>>();
+        final CompositeSet<Map.Entry<K, V>> entries = new CompositeSet<>();
         for (int i = composite.length - 1; i >= 0; --i) {
             entries.addComposited(composite[i].entrySet());
         }
@@ -263,8 +268,8 @@
      * operation may be used to distinguish these two cases.
      *
      * <p>More formally, if this map contains a mapping from a key
-     * {@code k} to a value {@code v} such that <tt>(key==null ? k==null :
-     * key.equals(k))</tt>, then this method returns {@code v}; otherwise
+     * {@code k} to a value {@code v} such that <code>(key==null ? k==null :
+     * key.equals(k))</code>, then this method returns {@code v}; otherwise
      * it returns {@code null}.  (There can be at most one such mapping.)
      *
      * @param key key whose associated value is to be returned.
@@ -278,6 +283,7 @@
      *
      * @see #containsKey(Object)
      */
+    @Override
     public V get(final Object key) {
         for (int i = this.composite.length - 1; i >= 0; --i) {
             if (this.composite[i].containsKey(key)) {
@@ -292,6 +298,7 @@
      *
      * @return {@code true} if this map contains no key-value mappings.
      */
+    @Override
     public boolean isEmpty() {
         for (int i = this.composite.length - 1; i >= 0; --i) {
             if (!this.composite[i].isEmpty()) {
@@ -316,8 +323,9 @@
      *
      * @return a set view of the keys contained in this map.
      */
+    @Override
     public Set<K> keySet() {
-        final CompositeSet<K> keys = new CompositeSet<K>();
+        final CompositeSet<K> keys = new CompositeSet<>();
         for (int i = this.composite.length - 1; i >= 0; --i) {
             keys.addComposited(this.composite[i].keySet());
         }
@@ -349,6 +357,7 @@
      *            keys or values, and the specified key or value is
      *            {@code null}.
      */
+    @Override
     public V put(final K key, final V value) {
         if (this.mutator == null) {
             throw new UnsupportedOperationException("No mutator specified");
@@ -378,6 +387,7 @@
      *         this map does not permit {@code null} keys or values, and the
      *         specified map contains {@code null} keys or values.
      */
+    @Override
     public void putAll(final Map<? extends K, ? extends V> map) {
         if (this.mutator == null) {
             throw new UnsupportedOperationException("No mutator specified");
@@ -410,6 +420,7 @@
      * @throws UnsupportedOperationException if the {@code remove} method is
      *         not supported by the composited map containing the key
      */
+    @Override
     public V remove(final Object key) {
         for (int i = this.composite.length - 1; i >= 0; --i) {
             if (this.composite[i].containsKey(key)) {
@@ -426,6 +437,7 @@
      *
      * @return the number of key-value mappings in this map.
      */
+    @Override
     public int size() {
         int size = 0;
         for (int i = this.composite.length - 1; i >= 0; --i) {
@@ -447,8 +459,9 @@
      *
      * @return a collection view of the values contained in this map.
      */
+    @Override
     public Collection<V> values() {
-        final CompositeCollection<V> values = new CompositeCollection<V>();
+        final CompositeCollection<V> values = new CompositeCollection<>();
         for (int i = composite.length - 1; i >= 0; --i) {
             values.addComposited(composite[i].values());
         }
@@ -487,8 +500,11 @@
      * This interface allows definition for all of the indeterminate
      * mutators in a CompositeMap, as well as providing a hook for
      * callbacks on key collisions.
+     *
+     * @param <K> the type of the keys in the map
+     * @param <V> the type of the values in the map
      */
-    public static interface MapMutator<K, V> extends Serializable {
+    public interface MapMutator<K, V> extends Serializable {
         /**
          * Called when adding a new Composited Map results in a
          * key collision.
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/DefaultedMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/DefaultedMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/DefaultedMap.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/DefaultedMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -56,9 +56,10 @@
  * using {@link java.util.Collections#synchronizedMap(Map)}. This class may throw
  * exceptions when accessed by concurrent threads without synchronization.
  *
- * @since 3.2
- * @version $Id: DefaultedMap.java 1686855 2015-06-22 13:00:27Z tn $
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  *
+ * @since 3.2
  * @see LazyMap
  */
 public class DefaultedMap<K, V> extends AbstractMapDecorator<K, V> implements Serializable {
@@ -84,7 +85,7 @@
      * @since 4.0
      */
     public static <K, V> DefaultedMap<K, V> defaultedMap(final Map<K, V> map, final V defaultValue) {
-        return new DefaultedMap<K, V>(map, ConstantTransformer.constantTransformer(defaultValue));
+        return new DefaultedMap<>(map, ConstantTransformer.constantTransformer(defaultValue));
     }
 
     /**
@@ -105,7 +106,7 @@
         if (factory == null) {
             throw new IllegalArgumentException("Factory must not be null");
         }
-        return new DefaultedMap<K, V>(map, FactoryTransformer.factoryTransformer(factory));
+        return new DefaultedMap<>(map, FactoryTransformer.factoryTransformer(factory));
     }
 
     /**
@@ -128,7 +129,7 @@
         if (transformer == null) {
            throw new IllegalArgumentException("Transformer must not be null");
        }
-       return new DefaultedMap<K, V>(map, transformer);
+       return new DefaultedMap<>(map, transformer);
     }
 
     //-----------------------------------------------------------------------
@@ -174,7 +175,7 @@
      * Write the map out using a custom routine.
      *
      * @param out  the output stream
-     * @throws IOException
+     * @throws IOException if an error occurs while writing to the stream
      */
     private void writeObject(final ObjectOutputStream out) throws IOException {
         out.defaultWriteObject();
@@ -185,8 +186,8 @@
      * Read the map in using a custom routine.
      *
      * @param in  the input stream
-     * @throws IOException
-     * @throws ClassNotFoundException
+     * @throws IOException if an error occurs while reading from the stream
+     * @throws ClassNotFoundException if an object read from the stream can not be loaded
      */
     @SuppressWarnings("unchecked")
     private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
@@ -198,11 +199,10 @@
     @Override
     @SuppressWarnings("unchecked")
     public V get(final Object key) {
-        // create value for key if key is not currently in the map
-        if (map.containsKey(key) == false) {
-            return value.transform((K) key);
-        }
-        return map.get(key);
+        V v;
+        return (((v = map.get(key)) != null) || map.containsKey(key))
+          ? v
+          : value.transform((K) key);
     }
 
     // no need to wrap keySet, entrySet or values as they are views of
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/EntrySetToMapIteratorAdapter.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/EntrySetToMapIteratorAdapter.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/EntrySetToMapIteratorAdapter.java	2013-06-18 20:54:29.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/EntrySetToMapIteratorAdapter.java	2018-07-08 00:18:18.000000000 +0000
@@ -26,8 +26,10 @@
 /**
  * Adapts a Map entrySet to the MapIterator interface.
  *
+ * @param <K> the type of the keys in the map
+ * @param <V> the type of the values in the map
+ *
  * @since 4.0
- * @version $Id: EntrySetToMapIteratorAdapter.java 1494296 2013-06-18 20:54:29Z tn $
  */
 public class EntrySetToMapIteratorAdapter<K, V> implements MapIterator<K, V>, ResettableIterator<K> {
 
@@ -52,6 +54,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public K getKey() {
         return current().getKey();
     }
@@ -59,6 +62,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public V getValue() {
         return current().getValue();
     }
@@ -66,6 +70,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public V setValue(final V value) {
         return current().setValue(value);
     }
@@ -73,6 +78,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean hasNext() {
         return iterator.hasNext();
     }
@@ -80,6 +86,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public K next() {
         entry = iterator.next();
         return getKey();
@@ -88,6 +95,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public synchronized void reset() {
         iterator = entrySet.iterator();
     }
@@ -95,6 +103,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public void remove() {
         iterator.remove();
         entry = null;
@@ -102,7 +111,7 @@
 
     /**
      * Get the currently active entry.
-     * @return Map.Entry<K, V>
+     * @return Map.Entry&lt;K, V&gt;
      */
     protected synchronized Map.Entry<K, V> current() {
         if (entry == null) {
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/FixedSizeMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/FixedSizeMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/FixedSizeMap.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/FixedSizeMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -49,8 +49,9 @@
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  * @since 3.0
- * @version $Id: FixedSizeMap.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class FixedSizeMap<K, V>
         extends AbstractMapDecorator<K, V>
@@ -70,7 +71,7 @@
      * @since 4.0
      */
     public static <K, V> FixedSizeMap<K, V> fixedSizeMap(final Map<K, V> map) {
-        return new FixedSizeMap<K, V>(map);
+        return new FixedSizeMap<>(map);
     }
 
     //-----------------------------------------------------------------------
@@ -89,7 +90,7 @@
      * Write the map out using a custom routine.
      *
      * @param out  the output stream
-     * @throws IOException
+     * @throws IOException if an error occurs while writing to the stream
      * @since 3.1
      */
     private void writeObject(final ObjectOutputStream out) throws IOException {
@@ -101,8 +102,8 @@
      * Read the map in using a custom routine.
      *
      * @param in  the input stream
-     * @throws IOException
-     * @throws ClassNotFoundException
+     * @throws IOException if an error occurs while reading from the stream
+     * @throws ClassNotFoundException if an object read from the stream can not be loaded
      * @since 3.1
      */
     @SuppressWarnings("unchecked") // (1) should only fail if input stream is incorrect
@@ -159,10 +160,12 @@
         return UnmodifiableCollection.unmodifiableCollection(coll);
     }
 
+    @Override
     public boolean isFull() {
         return true;
     }
 
+    @Override
     public int maxSize() {
         return size();
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/FixedSizeSortedMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/FixedSizeSortedMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/FixedSizeSortedMap.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/FixedSizeSortedMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -51,8 +51,9 @@
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  * @since 3.0
- * @version $Id: FixedSizeSortedMap.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class FixedSizeSortedMap<K, V>
         extends AbstractSortedMapDecorator<K, V>
@@ -72,7 +73,7 @@
      * @since 4.0
      */
     public static <K, V> FixedSizeSortedMap<K, V> fixedSizeSortedMap(final SortedMap<K, V> map) {
-        return new FixedSizeSortedMap<K, V>(map);
+        return new FixedSizeSortedMap<>(map);
     }
 
     //-----------------------------------------------------------------------
@@ -98,6 +99,9 @@
     //-----------------------------------------------------------------------
     /**
      * Write the map out using a custom routine.
+     *
+     * @param out  the output stream
+     * @throws IOException if an error occurs while writing to the stream
      */
     private void writeObject(final ObjectOutputStream out) throws IOException {
         out.defaultWriteObject();
@@ -106,6 +110,10 @@
 
     /**
      * Read the map in using a custom routine.
+     *
+     * @param in the input stream
+     * @throws IOException if an error occurs while reading from the stream
+     * @throws ClassNotFoundException if an object read from the stream can not be loaded
      */
     @SuppressWarnings("unchecked") // (1) should only fail if input stream is incorrect
     private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
@@ -158,23 +166,25 @@
     //-----------------------------------------------------------------------
     @Override
     public SortedMap<K, V> subMap(final K fromKey, final K toKey) {
-        return new FixedSizeSortedMap<K, V>(getSortedMap().subMap(fromKey, toKey));
+        return new FixedSizeSortedMap<>(getSortedMap().subMap(fromKey, toKey));
     }
 
     @Override
     public SortedMap<K, V> headMap(final K toKey) {
-        return new FixedSizeSortedMap<K, V>(getSortedMap().headMap(toKey));
+        return new FixedSizeSortedMap<>(getSortedMap().headMap(toKey));
     }
 
     @Override
     public SortedMap<K, V> tailMap(final K fromKey) {
-        return new FixedSizeSortedMap<K, V>(getSortedMap().tailMap(fromKey));
+        return new FixedSizeSortedMap<>(getSortedMap().tailMap(fromKey));
     }
 
+    @Override
     public boolean isFull() {
         return true;
     }
 
+    @Override
     public int maxSize() {
         return size();
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/Flat3Map.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/Flat3Map.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/Flat3Map.java	2013-04-30 19:56:11.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/Flat3Map.java	2018-07-08 00:18:18.000000000 +0000
@@ -67,8 +67,9 @@
  * using {@link java.util.Collections#synchronizedMap(Map)}. This class may throw
  * exceptions when accessed by concurrent threads without synchronization.
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  * @since 3.0
- * @version $Id: Flat3Map.java 1477799 2013-04-30 19:56:11Z tn $
  */
 public class Flat3Map<K, V> implements IterableMap<K, V>, Serializable, Cloneable {
 
@@ -123,6 +124,7 @@
      * @param key  the key
      * @return the mapped value, null if no match
      */
+    @Override
     public V get(final Object key) {
         if (delegateMap != null) {
             return delegateMap.get(key);
@@ -171,6 +173,7 @@
      *
      * @return the size
      */
+    @Override
     public int size() {
         if (delegateMap != null) {
             return delegateMap.size();
@@ -183,6 +186,7 @@
      *
      * @return true if the map is currently size zero
      */
+    @Override
     public boolean isEmpty() {
         return size() == 0;
     }
@@ -194,6 +198,7 @@
      * @param key  the key to search for
      * @return true if the map contains the key
      */
+    @Override
     public boolean containsKey(final Object key) {
         if (delegateMap != null) {
             return delegateMap.containsKey(key);
@@ -241,6 +246,7 @@
      * @param value  the value to search for
      * @return true if the map contains the key
      */
+    @Override
     public boolean containsValue(final Object value) {
         if (delegateMap != null) {
             return delegateMap.containsValue(value);
@@ -287,6 +293,7 @@
      * @param value  the value to add
      * @return the value previously mapped to this key, null if none
      */
+    @Override
     public V put(final K key, final V value) {
         if (delegateMap != null) {
             return delegateMap.put(key, value);
@@ -371,6 +378,7 @@
      * @param map  the map to add
      * @throws NullPointerException if the map is null
      */
+    @Override
     public void putAll(final Map<? extends K, ? extends V> map) {
         final int size = map.size();
         if (size == 0) {
@@ -425,7 +433,7 @@
      * @since 3.1
      */
     protected AbstractHashedMap<K, V> createDelegateMap() {
-        return new HashedMap<K, V>();
+        return new HashedMap<>();
     }
 
     /**
@@ -434,6 +442,7 @@
      * @param key  the mapping to remove
      * @return the value mapped to the removed key, null if key not in map
      */
+    @Override
     public V remove(final Object key) {
         if (delegateMap != null) {
             return delegateMap.remove(key);
@@ -582,6 +591,7 @@
      * Clears the map, resetting the size to zero and nullifying references
      * to avoid garbage collection issues.
      */
+    @Override
     public void clear() {
         if (delegateMap != null) {
             delegateMap.clear();  // should aid gc
@@ -606,6 +616,7 @@
      *
      * @return the map iterator
      */
+    @Override
     public MapIterator<K, V> mapIterator() {
         if (delegateMap != null) {
             return delegateMap.mapIterator();
@@ -613,7 +624,7 @@
         if (size == 0) {
             return EmptyMapIterator.<K, V>emptyMapIterator();
         }
-        return new FlatMapIterator<K, V>(this);
+        return new FlatMapIterator<>(this);
     }
 
     /**
@@ -629,10 +640,12 @@
             this.parent = parent;
         }
 
+        @Override
         public boolean hasNext() {
             return nextIndex < parent.size;
         }
 
+        @Override
         public K next() {
             if (hasNext() == false) {
                 throw new NoSuchElementException(AbstractHashedMap.NO_NEXT_ENTRY);
@@ -642,6 +655,7 @@
             return getKey();
         }
 
+        @Override
         public void remove() {
             if (canRemove == false) {
                 throw new IllegalStateException(AbstractHashedMap.REMOVE_INVALID);
@@ -651,6 +665,7 @@
             canRemove = false;
         }
 
+        @Override
         public K getKey() {
             if (canRemove == false) {
                 throw new IllegalStateException(AbstractHashedMap.GETKEY_INVALID);
@@ -666,6 +681,7 @@
             throw new IllegalStateException("Invalid map index: " + nextIndex);
         }
 
+        @Override
         public V getValue() {
             if (canRemove == false) {
                 throw new IllegalStateException(AbstractHashedMap.GETVALUE_INVALID);
@@ -681,6 +697,7 @@
             throw new IllegalStateException("Invalid map index: " + nextIndex);
         }
 
+        @Override
         public V setValue(final V value) {
             if (canRemove == false) {
                 throw new IllegalStateException(AbstractHashedMap.SETVALUE_INVALID);
@@ -702,6 +719,7 @@
             return old;
         }
 
+        @Override
         public void reset() {
             nextIndex = 0;
             canRemove = false;
@@ -726,11 +744,12 @@
      *
      * @return the entrySet view
      */
+    @Override
     public Set<Map.Entry<K, V>> entrySet() {
         if (delegateMap != null) {
             return delegateMap.entrySet();
         }
-        return new EntrySet<K, V>(this);
+        return new EntrySet<>(this);
     }
 
     /**
@@ -774,7 +793,7 @@
             if (parent.size() == 0) {
                 return EmptyIterator.<Map.Entry<K, V>>emptyIterator();
             }
-            return new EntrySetIterator<K, V>(parent);
+            return new EntrySetIterator<>(parent);
         }
     }
 
@@ -796,12 +815,13 @@
          * As a consequence, all subsequent call to {@link #getKey()},
          * {@link #setValue(Object)} and {@link #getValue()} will fail.
          *
-         * @param flag
+         * @param flag the new value of the removed flag
          */
         void setRemoved(final boolean flag) {
             this.removed = flag;
         }
 
+        @Override
         public K getKey() {
             if (removed) {
                 throw new IllegalStateException(AbstractHashedMap.GETKEY_INVALID);
@@ -817,6 +837,7 @@
             throw new IllegalStateException("Invalid map index: " + index);
         }
 
+        @Override
         public V getValue() {
             if (removed) {
                 throw new IllegalStateException(AbstractHashedMap.GETVALUE_INVALID);
@@ -832,6 +853,7 @@
             throw new IllegalStateException("Invalid map index: " + index);
         }
 
+        @Override
         public V setValue(final V value) {
             if (removed) {
                 throw new IllegalStateException(AbstractHashedMap.SETVALUE_INVALID);
@@ -909,7 +931,7 @@
             if (!hasNext()) {
                 throw new NoSuchElementException(AbstractHashedMap.NO_NEXT_ENTRY);
             }
-            currentEntry = new FlatMapEntry<K, V>(parent, ++nextIndex);
+            currentEntry = new FlatMapEntry<>(parent, ++nextIndex);
             return currentEntry;
         }
 
@@ -933,6 +955,7 @@
             super(parent);
         }
 
+        @Override
         public Map.Entry<K, V> next() {
             return nextEntry();
         }
@@ -945,11 +968,12 @@
      *
      * @return the keySet view
      */
+    @Override
     public Set<K> keySet() {
         if (delegateMap != null) {
             return delegateMap.keySet();
         }
-        return new KeySet<K>(this);
+        return new KeySet<>(this);
     }
 
     /**
@@ -993,7 +1017,7 @@
             if (parent.size() == 0) {
                 return EmptyIterator.<K>emptyIterator();
             }
-            return new KeySetIterator<K>(parent);
+            return new KeySetIterator<>(parent);
         }
     }
 
@@ -1007,6 +1031,7 @@
             super((Flat3Map<K, Object>) parent);
         }
 
+        @Override
         public K next() {
             return nextEntry().getKey();
         }
@@ -1019,11 +1044,12 @@
      *
      * @return the values view
      */
+    @Override
     public Collection<V> values() {
         if (delegateMap != null) {
             return delegateMap.values();
         }
-        return new Values<V>(this);
+        return new Values<>(this);
     }
 
     /**
@@ -1060,7 +1086,7 @@
             if (parent.size() == 0) {
                 return EmptyIterator.<V>emptyIterator();
             }
-            return new ValuesIterator<V>(parent);
+            return new ValuesIterator<>(parent);
         }
     }
 
@@ -1074,6 +1100,7 @@
             super((Flat3Map<Object, V>) parent);
         }
 
+        @Override
         public V next() {
             return nextEntry().getValue();
         }
@@ -1082,6 +1109,9 @@
     //-----------------------------------------------------------------------
     /**
      * Write the map out using a custom routine.
+     *
+     * @param out  the output stream
+     * @throws IOException if an error occurs while writing to the stream
      */
     private void writeObject(final ObjectOutputStream out) throws IOException {
         out.defaultWriteObject();
@@ -1094,6 +1124,10 @@
 
     /**
      * Read the map in using a custom routine.
+     *
+     * @param in the input stream
+     * @throws IOException if an error occurs while reading from the stream
+     * @throws ClassNotFoundException if an object read from the stream can not be loaded
      */
     @SuppressWarnings("unchecked")
     private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/HashedMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/HashedMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/HashedMap.java	2013-10-20 21:12:51.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/HashedMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -36,8 +36,9 @@
  * using {@link java.util.Collections#synchronizedMap(Map)}. This class may throw
  * exceptions when accessed by concurrent threads without synchronization.
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  * @since 3.0
- * @version $Id: HashedMap.java 1533984 2013-10-20 21:12:51Z tn $
  */
 public class HashedMap<K, V>
         extends AbstractHashedMap<K, V> implements Serializable, Cloneable {
@@ -98,6 +99,9 @@
 
     /**
      * Write the map out using a custom routine.
+     *
+     * @param out  the output stream
+     * @throws IOException if an error occurs while writing to the stream
      */
     private void writeObject(final ObjectOutputStream out) throws IOException {
         out.defaultWriteObject();
@@ -106,6 +110,10 @@
 
     /**
      * Read the map in using a custom routine.
+     *
+     * @param in the input stream
+     * @throws IOException if an error occurs while reading from the stream
+     * @throws ClassNotFoundException if an object read from the stream can not be loaded
      */
     private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
         in.defaultReadObject();
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/LazyMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/LazyMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/LazyMap.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/LazyMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -56,8 +56,9 @@
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  * @since 3.0
- * @version $Id: LazyMap.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class LazyMap<K, V> extends AbstractMapDecorator<K, V> implements Serializable {
 
@@ -79,7 +80,7 @@
      * @since 4.0
      */
     public static <K, V> LazyMap<K, V> lazyMap(final Map<K, V> map, final Factory< ? extends V> factory) {
-        return new LazyMap<K,V>(map, factory);
+        return new LazyMap<>(map, factory);
     }
 
     /**
@@ -94,7 +95,7 @@
      * @since 4.0
      */
     public static <V, K> LazyMap<K, V> lazyMap(final Map<K, V> map, final Transformer<? super K, ? extends V> factory) {
-        return new LazyMap<K,V>(map, factory);
+        return new LazyMap<>(map, factory);
     }
 
     //-----------------------------------------------------------------------
@@ -133,7 +134,7 @@
      * Write the map out using a custom routine.
      *
      * @param out  the output stream
-     * @throws IOException
+     * @throws IOException if an error occurs while writing to the stream
      * @since 3.1
      */
     private void writeObject(final ObjectOutputStream out) throws IOException {
@@ -145,8 +146,8 @@
      * Read the map in using a custom routine.
      *
      * @param in  the input stream
-     * @throws IOException
-     * @throws ClassNotFoundException
+     * @throws IOException if an error occurs while reading from the stream
+     * @throws ClassNotFoundException if an object read from the stream can not be loaded
      * @since 3.1
      */
     @SuppressWarnings("unchecked")
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/LazySortedMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/LazySortedMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/LazySortedMap.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/LazySortedMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -53,8 +53,9 @@
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  * @since 3.0
- * @version $Id: LazySortedMap.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class LazySortedMap<K,V> extends LazyMap<K,V> implements SortedMap<K,V> {
 
@@ -74,7 +75,7 @@
      */
     public static <K, V> LazySortedMap<K, V> lazySortedMap(final SortedMap<K, V> map,
                                                            final Factory<? extends V> factory) {
-        return new LazySortedMap<K,V>(map, factory);
+        return new LazySortedMap<>(map, factory);
     }
 
     /**
@@ -90,7 +91,7 @@
      */
     public static <K, V> LazySortedMap<K, V> lazySortedMap(final SortedMap<K, V> map,
                                                            final Transformer<? super K, ? extends V> factory) {
-        return new LazySortedMap<K,V>(map, factory);
+        return new LazySortedMap<>(map, factory);
     }
 
     //-----------------------------------------------------------------------
@@ -127,31 +128,37 @@
     }
 
     //-----------------------------------------------------------------------
+    @Override
     public K firstKey() {
         return getSortedMap().firstKey();
     }
 
+    @Override
     public K lastKey() {
         return getSortedMap().lastKey();
     }
 
+    @Override
     public Comparator<? super K> comparator() {
         return getSortedMap().comparator();
     }
 
+    @Override
     public SortedMap<K,V> subMap(final K fromKey, final K toKey) {
         final SortedMap<K,V> map = getSortedMap().subMap(fromKey, toKey);
-        return new LazySortedMap<K,V>(map, factory);
+        return new LazySortedMap<>(map, factory);
     }
 
+    @Override
     public SortedMap<K,V> headMap(final K toKey) {
         final SortedMap<K,V> map = getSortedMap().headMap(toKey);
-        return new LazySortedMap<K,V>(map, factory);
+        return new LazySortedMap<>(map, factory);
     }
 
+    @Override
     public SortedMap<K,V> tailMap(final K fromKey) {
         final SortedMap<K,V> map = getSortedMap().tailMap(fromKey);
-        return new LazySortedMap<K,V>(map, factory);
+        return new LazySortedMap<>(map, factory);
     }
 
 }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/LinkedMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/LinkedMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/LinkedMap.java	2013-10-20 21:12:51.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/LinkedMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -57,8 +57,9 @@
  * using {@link java.util.Collections#synchronizedMap(Map)}. This class may throw
  * exceptions when accessed by concurrent threads without synchronization.
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  * @since 3.0
- * @version $Id: LinkedMap.java 1533984 2013-10-20 21:12:51Z tn $
  */
 public class LinkedMap<K, V> extends AbstractLinkedMap<K, V> implements Serializable, Cloneable {
 
@@ -118,6 +119,9 @@
 
     /**
      * Write the map out using a custom routine.
+     *
+     * @param out  the output stream
+     * @throws IOException if an error occurs while writing to the stream
      */
     private void writeObject(final ObjectOutputStream out) throws IOException {
         out.defaultWriteObject();
@@ -126,6 +130,10 @@
 
     /**
      * Read the map in using a custom routine.
+     *
+     * @param in the input stream
+     * @throws IOException if an error occurs while reading from the stream
+     * @throws ClassNotFoundException if an object read from the stream can not be loaded
      */
     private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
         in.defaultReadObject();
@@ -200,7 +208,7 @@
      * @return The ordered list of keys.
      */
     public List<K> asList() {
-        return new LinkedMapList<K>(this);
+        return new LinkedMapList<>(this);
     }
 
     /**
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/ListOrderedMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/ListOrderedMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/ListOrderedMap.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/ListOrderedMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -72,8 +72,9 @@
  * <p>
  * This class is {@link Serializable} starting with Commons Collections 3.1.
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  * @since 3.0
- * @version $Id: ListOrderedMap.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class ListOrderedMap<K, V>
         extends AbstractMapDecorator<K, V>
@@ -83,7 +84,7 @@
     private static final long serialVersionUID = 2728177751851003750L;
 
     /** Internal list to hold the sequence of objects */
-    private final List<K> insertOrder = new ArrayList<K>();
+    private final List<K> insertOrder = new ArrayList<>();
 
     /**
      * Factory method to create an ordered map.
@@ -98,7 +99,7 @@
      * @since 4.0
      */
     public static <K, V> ListOrderedMap<K, V> listOrderedMap(final Map<K, V> map) {
-        return new ListOrderedMap<K, V>(map);
+        return new ListOrderedMap<>(map);
     }
 
     //-----------------------------------------------------------------------
@@ -128,7 +129,7 @@
      * Write the map out using a custom routine.
      *
      * @param out  the output stream
-     * @throws IOException
+     * @throws IOException if an error occurs while writing to the stream
      * @since 3.1
      */
     private void writeObject(final ObjectOutputStream out) throws IOException {
@@ -140,8 +141,8 @@
      * Read the map in using a custom routine.
      *
      * @param in  the input stream
-     * @throws IOException
-     * @throws ClassNotFoundException
+     * @throws IOException if an error occurs while reading from the stream
+     * @throws ClassNotFoundException if an object read from the stream can not be loaded
      * @since 3.1
      */
     @SuppressWarnings("unchecked") // (1) should only fail if input stream is incorrect
@@ -154,7 +155,7 @@
     //-----------------------------------------------------------------------
     @Override
     public OrderedMapIterator<K, V> mapIterator() {
-        return new ListOrderedMapIterator<K, V>(this);
+        return new ListOrderedMapIterator<>(this);
     }
 
     /**
@@ -163,6 +164,7 @@
      * @return the first key currently in this map
      * @throws NoSuchElementException if this map is empty
      */
+    @Override
     public K firstKey() {
         if (size() == 0) {
             throw new NoSuchElementException("Map is empty");
@@ -176,6 +178,7 @@
      * @return the last key currently in this map
      * @throws NoSuchElementException if this map is empty
      */
+    @Override
     public K lastKey() {
         if (size() == 0) {
             throw new NoSuchElementException("Map is empty");
@@ -190,6 +193,7 @@
      * @param key  the key to find previous for
      * @return the next key, null if no match or at start
      */
+    @Override
     public K nextKey(final Object key) {
         final int index = insertOrder.indexOf(key);
         if (index >= 0 && index < size() - 1) {
@@ -205,6 +209,7 @@
      * @param key  the key to find previous for
      * @return the previous key, null if no match or at start
      */
+    @Override
     public K previousKey(final Object key) {
         final int index = insertOrder.indexOf(key);
         if (index > 0) {
@@ -288,7 +293,7 @@
      */
     @Override
     public Set<K> keySet() {
-        return new KeySetView<K>(this);
+        return new KeySetView<>(this);
     }
 
     /**
@@ -318,7 +323,7 @@
      */
     @Override
     public Collection<V> values() {
-        return new ValuesView<V>(this);
+        return new ValuesView<>(this);
     }
 
     /**
@@ -332,7 +337,7 @@
      * @since 3.2
      */
     public List<V> valueList() {
-        return new ValuesView<V>(this);
+        return new ValuesView<>(this);
     }
 
     /**
@@ -344,7 +349,7 @@
      */
     @Override
     public Set<Map.Entry<K, V>> entrySet() {
-        return new EntrySetView<K, V>(this, this.insertOrder);
+        return new EntrySetView<>(this, this.insertOrder);
     }
 
     //-----------------------------------------------------------------------
@@ -525,6 +530,7 @@
         @Override
         public Iterator<V> iterator() {
             return new AbstractUntypedIteratorDecorator<Map.Entry<Object, V>, V>(parent.entrySet().iterator()) {
+                @Override
                 public V next() {
                     return getIterator().next().getValue();
                 }
@@ -575,6 +581,7 @@
         @Override
         public Iterator<K> iterator() {
             return new AbstractUntypedIteratorDecorator<Map.Entry<K, Object>, K>(parent.entrySet().iterator()) {
+                @Override
                 public K next() {
                     return getIterator().next().getKey();
                 }
@@ -659,7 +666,7 @@
 
         @Override
         public Iterator<Map.Entry<K, V>> iterator() {
-            return new ListOrderedIterator<K, V>(parent, insertOrder);
+            return new ListOrderedIterator<>(parent, insertOrder);
         }
     }
 
@@ -673,9 +680,10 @@
             this.parent = parent;
         }
 
+        @Override
         public Map.Entry<K, V> next() {
             last = getIterator().next();
-            return new ListOrderedMapEntry<K, V>(parent, last);
+            return new ListOrderedMapEntry<>(parent, last);
         }
 
         @Override
@@ -718,26 +726,31 @@
             this.iterator = parent.insertOrder.listIterator();
         }
 
+        @Override
         public boolean hasNext() {
             return iterator.hasNext();
         }
 
+        @Override
         public K next() {
             last = iterator.next();
             readable = true;
             return last;
         }
 
+        @Override
         public boolean hasPrevious() {
             return iterator.hasPrevious();
         }
 
+        @Override
         public K previous() {
             last = iterator.previous();
             readable = true;
             return last;
         }
 
+        @Override
         public void remove() {
             if (readable == false) {
                 throw new IllegalStateException(AbstractHashedMap.REMOVE_INVALID);
@@ -747,6 +760,7 @@
             readable = false;
         }
 
+        @Override
         public K getKey() {
             if (readable == false) {
                 throw new IllegalStateException(AbstractHashedMap.GETKEY_INVALID);
@@ -754,6 +768,7 @@
             return last;
         }
 
+        @Override
         public V getValue() {
             if (readable == false) {
                 throw new IllegalStateException(AbstractHashedMap.GETVALUE_INVALID);
@@ -761,6 +776,7 @@
             return parent.get(last);
         }
 
+        @Override
         public V setValue(final V value) {
             if (readable == false) {
                 throw new IllegalStateException(AbstractHashedMap.SETVALUE_INVALID);
@@ -768,6 +784,7 @@
             return parent.map.put(last, value);
         }
 
+        @Override
         public void reset() {
             iterator = parent.insertOrder.listIterator();
             last = null;
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/LRUMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/LRUMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/LRUMap.java	2015-06-01 22:40:56.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/LRUMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -54,8 +54,9 @@
  * using {@link java.util.Collections#synchronizedMap(Map)}. This class may throw
  * <code>NullPointerException</code>'s when accessed by concurrent threads.
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  * @since 3.0 (previously in main package v1.0)
- * @version $Id: LRUMap.java 1683016 2015-06-01 22:40:56Z tn $
  */
 public class LRUMap<K, V>
         extends AbstractLinkedMap<K, V> implements BoundedMap<K, V>, Serializable, Cloneable {
@@ -198,8 +199,8 @@
 
     /**
      * Constructor copying elements from another map.
-     * <p/>
-     * The maximum size is set from the map's size.
+     *
+     * <p>The maximum size is set from the map's size.</p>
      *
      * @param map  the map to copy
      * @param scanUntilRemovable  scan until a removeable entry is found, default false
@@ -443,6 +444,7 @@
      *
      * @return <code>true</code> if the map is full
      */
+    @Override
     public boolean isFull() {
         return size >= maxSize;
     }
@@ -452,6 +454,7 @@
      *
      * @return the maximum number of elements the map can hold
      */
+    @Override
     public int maxSize() {
         return maxSize;
     }
@@ -480,6 +483,9 @@
 
     /**
      * Write the map out using a custom routine.
+     *
+     * @param out  the output stream
+     * @throws IOException if an error occurs while writing to the stream
      */
     private void writeObject(final ObjectOutputStream out) throws IOException {
         out.defaultWriteObject();
@@ -488,6 +494,10 @@
 
     /**
      * Read the map in using a custom routine.
+     *
+     * @param in the input stream
+     * @throws IOException if an error occurs while reading from the stream
+     * @throws ClassNotFoundException if an object read from the stream can not be loaded
      */
     private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
         in.defaultReadObject();
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/MultiKeyMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/MultiKeyMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/MultiKeyMap.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/MultiKeyMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -71,8 +71,9 @@
  * appropriate synchronization. This class may throw exceptions when accessed
  * by concurrent threads without synchronization.
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  * @since 3.1
- * @version $Id: MultiKeyMap.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class MultiKeyMap<K, V> extends AbstractMapDecorator<MultiKey<? extends K>, V>
         implements Serializable, Cloneable {
@@ -100,7 +101,7 @@
         if (map.size() > 0) {
             throw new IllegalArgumentException("Map must be empty");
         }
-        return new MultiKeyMap<K, V>(map);
+        return new MultiKeyMap<>(map);
     }
 
     //-----------------------------------------------------------------------
@@ -185,7 +186,7 @@
             }
             entry = entry.next;
         }
-        decorated().addMapping(index, hashCode, new MultiKey<K>(key1, key2), value);
+        decorated().addMapping(index, hashCode, new MultiKey<>(key1, key2), value);
         return null;
     }
 
@@ -317,7 +318,7 @@
             }
             entry = entry.next;
         }
-        decorated().addMapping(index, hashCode, new MultiKey<K>(key1, key2, key3), value);
+        decorated().addMapping(index, hashCode, new MultiKey<>(key1, key2, key3), value);
         return null;
     }
 
@@ -459,7 +460,7 @@
             }
             entry = entry.next;
         }
-        decorated().addMapping(index, hashCode, new MultiKey<K>(key1, key2, key3, key4), value);
+        decorated().addMapping(index, hashCode, new MultiKey<>(key1, key2, key3, key4), value);
         return null;
     }
 
@@ -612,7 +613,7 @@
             }
             entry = entry.next;
         }
-        decorated().addMapping(index, hashCode, new MultiKey<K>(key1, key2, key3, key4, key5), value);
+        decorated().addMapping(index, hashCode, new MultiKey<>(key1, key2, key3, key4, key5), value);
         return null;
     }
 
@@ -885,7 +886,7 @@
      * Write the map out using a custom routine.
      *
      * @param out  the output stream
-     * @throws IOException
+     * @throws IOException if an error occurs while writing to the stream
      */
     private void writeObject(final ObjectOutputStream out) throws IOException {
         out.defaultWriteObject();
@@ -896,8 +897,8 @@
      * Read the map in using a custom routine.
      *
      * @param in  the input stream
-     * @throws IOException
-     * @throws ClassNotFoundException
+     * @throws IOException if an error occurs while reading from the stream
+     * @throws ClassNotFoundException if an object read from the stream can not be loaded
      */
     @SuppressWarnings("unchecked")
     private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/MultiValueMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/MultiValueMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/MultiValueMap.java	2015-11-14 20:24:42.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/MultiValueMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -59,8 +59,9 @@
  * appropriate synchronization. This class may throw exceptions when accessed
  * by concurrent threads without synchronization.
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  * @since 3.2
- * @version $Id: MultiValueMap.java 1714360 2015-11-14 20:24:42Z tn $
  * @deprecated since 4.1, use {@link org.apache.commons.collections4.MultiValuedMap MultiValuedMap} instead
  */
 @Deprecated
@@ -103,7 +104,7 @@
      */
     public static <K, V, C extends Collection<V>> MultiValueMap<K, V> multiValueMap(final Map<K, ? super C> map,
                                                                                     final Class<C> collectionClass) {
-        return new MultiValueMap<K, V>(map, new ReflectionFactory<C>(collectionClass));
+        return new MultiValueMap<>(map, new ReflectionFactory<>(collectionClass));
     }
 
     /**
@@ -120,7 +121,7 @@
      */
     public static <K, V, C extends Collection<V>> MultiValueMap<K, V> multiValueMap(final Map<K, ? super C> map,
             final Factory<C> collectionFactory) {
-        return new MultiValueMap<K, V>(map, collectionFactory);
+        return new MultiValueMap<>(map, collectionFactory);
     }
 
     //-----------------------------------------------------------------------
@@ -156,7 +157,7 @@
      * Write the map out using a custom routine.
      *
      * @param out  the output stream
-     * @throws IOException
+     * @throws IOException if an error occurs while writing to the stream
      * @since 4.0
      */
     private void writeObject(final ObjectOutputStream out) throws IOException {
@@ -168,8 +169,8 @@
      * Read the map in using a custom routine.
      *
      * @param in  the input stream
-     * @throws IOException
-     * @throws ClassNotFoundException
+     * @throws IOException if an error occurs while reading from the stream
+     * @throws ClassNotFoundException if an object read from the stream can not be loaded
      * @since 4.0
      */
     @SuppressWarnings("unchecked") // (1) should only fail if input stream is incorrect
@@ -310,7 +311,7 @@
      * @see #iterator()
      */
     @Override
-    public Set<Entry<K, Object>> entrySet() {
+    public Set<Entry<K, Object>> entrySet() { // NOPMD
         return super.entrySet();
     }
 
@@ -423,12 +424,12 @@
      * @since 4.0
      */
     public Iterator<Entry<K, V>> iterator() {
-        final Collection<K> allKeys = new ArrayList<K>(keySet());
+        final Collection<K> allKeys = new ArrayList<>(keySet());
         final Iterator<K> keyIterator = allKeys.iterator();
 
         return new LazyIteratorChain<Entry<K, V>>() {
             @Override
-            protected Iterator<? extends Entry<K, V>> nextIterator(int count) {
+            protected Iterator<? extends Entry<K, V>> nextIterator(final int count) {
                 if ( ! keyIterator.hasNext() ) {
                     return null;
                 }
@@ -446,13 +447,13 @@
                                 return input;
                             }
                             @Override
-                            public V setValue(V value) {
+                            public V setValue(final V value) {
                                 throw new UnsupportedOperationException();
                             }
                         };
                     }
                 };
-                return new TransformIterator<V, Entry<K, V>>(new ValuesIterator(key), transformer);
+                return new TransformIterator<>(new ValuesIterator(key), transformer);
             }
         };
     }
@@ -491,7 +492,7 @@
     private class Values extends AbstractCollection<V> {
         @Override
         public Iterator<V> iterator() {
-            final IteratorChain<V> chain = new IteratorChain<V>();
+            final IteratorChain<V> chain = new IteratorChain<>();
             for (final K k : keySet()) {
                 chain.addIterator(new ValuesIterator(k));
             }
@@ -565,7 +566,7 @@
             }
         }
 
-        private void readObject(ObjectInputStream is) throws IOException, ClassNotFoundException {
+        private void readObject(final ObjectInputStream is) throws IOException, ClassNotFoundException {
             is.defaultReadObject();
             // ensure that the de-serialized class is a Collection, COLLECTIONS-580
             if (clazz != null && !Collection.class.isAssignableFrom(clazz)) {
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/package-info.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/package-info.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/package-info.java	2013-04-17 17:37:03.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/package-info.java	2018-07-08 00:18:18.000000000 +0000
@@ -49,7 +49,6 @@
  *   <li>ListOrdered - ensures that insertion order is retained
  * </ul>
  *
- * @version $Id: package-info.java 1469004 2013-04-17 17:37:03Z tn $
  */
 package org.apache.commons.collections4.map;
 
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/PassiveExpiringMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/PassiveExpiringMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/PassiveExpiringMap.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/PassiveExpiringMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -55,10 +55,9 @@
  * synchronization.
  * </p>
  *
- * @param <K> the type of the keys in the map
- * @param <V> the type of the values in the map
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  * @since 4.0
- * @version $Id: PassiveExpiringMap.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class PassiveExpiringMap<K, V>
     extends AbstractMapDecorator<K, V>
@@ -72,7 +71,6 @@
      * @param <K> the type of the keys in the map
      * @param <V> the type of the values in the map
      * @since 4.0
-     * @version $Id: PassiveExpiringMap.java 1686855 2015-06-22 13:00:27Z tn $
      */
     public static class ConstantTimeToLiveExpirationPolicy<K, V>
         implements ExpirationPolicy<K, V> {
@@ -134,6 +132,7 @@
          *         {@link System#currentTimeMillis()} is returned. Otherwise, -1
          *         is returned indicating the entry never expires.
          */
+        @Override
         public long expirationTime(final K key, final V value) {
             if (timeToLiveMillis >= 0L) {
                 // avoid numerical overflow
@@ -159,9 +158,8 @@
      * @param <K> the key object type.
      * @param <V> the value object type
      * @since 4.0
-     * @version $Id: PassiveExpiringMap.java 1686855 2015-06-22 13:00:27Z tn $
      */
-    public static interface ExpirationPolicy<K, V>
+    public interface ExpirationPolicy<K, V>
         extends Serializable {
 
         /**
@@ -199,7 +197,7 @@
     }
 
     /** map used to manage expiration times for the actual map entries. */
-    private final Map<Object, Long> expirationMap = new HashMap<Object, Long>();
+    private final Map<Object, Long> expirationMap = new HashMap<>();
 
     /** the policy used to determine time-to-live values for map entries. */
     private final ExpirationPolicy<K, V> expiringPolicy;
@@ -503,8 +501,8 @@
      * Read the map in using a custom routine.
      *
      * @param in the input stream
-     * @throws IOException
-     * @throws ClassNotFoundException
+     * @throws IOException if an error occurs while reading from the stream
+     * @throws ClassNotFoundException if an object read from the stream can not be loaded
      */
     @SuppressWarnings("unchecked")
     // (1) should only fail if input stream is incorrect
@@ -518,7 +516,7 @@
      * Write the map out using a custom routine.
      *
      * @param out the output stream
-     * @throws IOException
+     * @throws IOException if an error occurs while writing to the stream
      */
     private void writeObject(final ObjectOutputStream out)
         throws IOException {
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/PredicatedMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/PredicatedMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/PredicatedMap.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/PredicatedMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -44,8 +44,9 @@
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  * @since 3.0
- * @version $Id: PredicatedMap.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class PredicatedMap<K, V>
         extends AbstractInputCheckedMapDecorator<K, V>
@@ -78,7 +79,7 @@
     public static <K, V> PredicatedMap<K, V> predicatedMap(final Map<K, V> map,
                                                            final Predicate<? super K> keyPredicate,
                                                            final Predicate<? super V> valuePredicate) {
-        return new PredicatedMap<K, V>(map, keyPredicate, valuePredicate);
+        return new PredicatedMap<>(map, keyPredicate, valuePredicate);
     }
 
     //-----------------------------------------------------------------------
@@ -108,7 +109,7 @@
      * Write the map out using a custom routine.
      *
      * @param out  the output stream
-     * @throws IOException
+     * @throws IOException if an error occurs while writing to the stream
      * @since 3.1
      */
     private void writeObject(final ObjectOutputStream out) throws IOException {
@@ -120,8 +121,8 @@
      * Read the map in using a custom routine.
      *
      * @param in  the input stream
-     * @throws IOException
-     * @throws ClassNotFoundException
+     * @throws IOException if an error occurs while reading from the stream
+     * @throws ClassNotFoundException if an object read from the stream can not be loaded
      * @since 3.1
      */
     @SuppressWarnings("unchecked") // (1) should only fail if input stream is incorrect
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/PredicatedSortedMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/PredicatedSortedMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/PredicatedSortedMap.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/PredicatedSortedMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -45,8 +45,9 @@
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  * @since 3.0
- * @version $Id: PredicatedSortedMap.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class PredicatedSortedMap<K, V> extends PredicatedMap<K, V> implements SortedMap<K, V> {
 
@@ -70,7 +71,7 @@
      */
     public static <K, V> PredicatedSortedMap<K, V> predicatedSortedMap(final SortedMap<K, V> map,
             final Predicate<? super K> keyPredicate, final Predicate<? super V> valuePredicate) {
-        return new PredicatedSortedMap<K, V>(map, keyPredicate, valuePredicate);
+        return new PredicatedSortedMap<>(map, keyPredicate, valuePredicate);
     }
 
     //-----------------------------------------------------------------------
@@ -98,31 +99,37 @@
     }
 
     //-----------------------------------------------------------------------
+    @Override
     public K firstKey() {
         return getSortedMap().firstKey();
     }
 
+    @Override
     public K lastKey() {
         return getSortedMap().lastKey();
     }
 
+    @Override
     public Comparator<? super K> comparator() {
         return getSortedMap().comparator();
     }
 
+    @Override
     public SortedMap<K, V> subMap(final K fromKey, final K toKey) {
         final SortedMap<K, V> map = getSortedMap().subMap(fromKey, toKey);
-        return new PredicatedSortedMap<K, V>(map, keyPredicate, valuePredicate);
+        return new PredicatedSortedMap<>(map, keyPredicate, valuePredicate);
     }
 
+    @Override
     public SortedMap<K, V> headMap(final K toKey) {
         final SortedMap<K, V> map = getSortedMap().headMap(toKey);
-        return new PredicatedSortedMap<K, V>(map, keyPredicate, valuePredicate);
+        return new PredicatedSortedMap<>(map, keyPredicate, valuePredicate);
     }
 
+    @Override
     public SortedMap<K, V> tailMap(final K fromKey) {
         final SortedMap<K, V> map = getSortedMap().tailMap(fromKey);
-        return new PredicatedSortedMap<K, V>(map, keyPredicate, valuePredicate);
+        return new PredicatedSortedMap<>(map, keyPredicate, valuePredicate);
     }
 
 }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/ReferenceIdentityMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/ReferenceIdentityMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/ReferenceIdentityMap.java	2013-04-30 19:56:11.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/ReferenceIdentityMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -27,46 +27,54 @@
  * removed by the garbage collector and matches keys and values based
  * on <code>==</code> not <code>equals()</code>.
  * <p>
- * <p>
  * When you construct a <code>ReferenceIdentityMap</code>, you can specify what kind
  * of references are used to store the map's keys and values.
  * If non-hard references are used, then the garbage collector can remove
  * mappings if a key or value becomes unreachable, or if the JVM's memory is
  * running low. For information on how the different reference types behave,
  * see {@link Reference}.
+ * </p>
  * <p>
  * Different types of references can be specified for keys and values.
  * The default constructor uses hard keys and soft values, providing a
  * memory-sensitive cache.
+ * </p>
  * <p>
  * This map is similar to
  * {@link org.apache.commons.collections4.map.ReferenceMap ReferenceMap}.
  * It differs in that keys and values in this class are compared using <code>==</code>.
+ * </p>
  * <p>
  * This map will violate the detail of various Map and map view contracts.
  * As a general rule, don't compare this map to other maps.
+ * </p>
  * <p>
  * This {@link java.util.Map Map} implementation does <i>not</i> allow null elements.
  * Attempting to add a null key or value to the map will raise a <code>NullPointerException</code>.
+ * </p>
  * <p>
  * This implementation is not synchronized.
  * You can use {@link java.util.Collections#synchronizedMap} to
  * provide synchronized access to a <code>ReferenceIdentityMap</code>.
  * Remember that synchronization will not stop the garbage collector removing entries.
+ * </p>
  * <p>
  * All the available iterators can be reset back to the start by casting to
  * <code>ResettableIterator</code> and calling <code>reset()</code>.
+ * </p>
  * <p>
  * <strong>Note that ReferenceIdentityMap is not synchronized and is not thread-safe.</strong>
  * If you wish to use this map from multiple threads concurrently, you must use
  * appropriate synchronization. The simplest approach is to wrap this map
  * using {@link java.util.Collections#synchronizedMap}. This class may throw
  * exceptions when accessed by concurrent threads without synchronization.
+ * </p>
  *
- * @see java.lang.ref.Reference
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  *
+ * @see java.lang.ref.Reference
  * @since 3.0 (previously in main package v2.1)
- * @version $Id: ReferenceIdentityMap.java 1477799 2013-04-30 19:56:11Z tn $
  */
 public class ReferenceIdentityMap<K, V> extends AbstractReferenceMap<K, V> implements Serializable {
 
@@ -223,6 +231,9 @@
     //-----------------------------------------------------------------------
     /**
      * Write the map out using a custom routine.
+     *
+     * @param out the output stream
+     * @throws IOException if an error occurs while writing to the stream
      */
     private void writeObject(final ObjectOutputStream out) throws IOException {
         out.defaultWriteObject();
@@ -231,6 +242,10 @@
 
     /**
      * Read the map in using a custom routine.
+     *
+     * @param in the input stream
+     * @throws IOException if an error occurs while reading from the stream
+     * @throws ClassNotFoundException if an object read from the stream can not be loaded
      */
     private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
         in.defaultReadObject();
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/ReferenceMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/ReferenceMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/ReferenceMap.java	2013-04-30 19:56:11.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/ReferenceMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -65,10 +65,11 @@
  * (previously it extended AbstractMap). As a result, the implementation is now
  * extensible and provides a <code>MapIterator</code>.
  *
- * @see java.lang.ref.Reference
+ * @param <K> the type of the keys in the map
+ * @param <V> the type of the values in the map
  *
+ * @see java.lang.ref.Reference
  * @since 3.0 (previously in main package v2.1)
- * @version $Id: ReferenceMap.java 1477799 2013-04-30 19:56:11Z tn $
  */
 public class ReferenceMap<K, V> extends AbstractReferenceMap<K, V> implements Serializable {
 
@@ -167,6 +168,9 @@
     //-----------------------------------------------------------------------
     /**
      * Write the map out using a custom routine.
+     *
+     * @param out  the output stream
+     * @throws IOException if an error occurs while writing to the stream
      */
     private void writeObject(final ObjectOutputStream out) throws IOException {
         out.defaultWriteObject();
@@ -175,6 +179,10 @@
 
     /**
      * Read the map in using a custom routine.
+     *
+     * @param in the input stream
+     * @throws IOException if an error occurs while reading from the stream
+     * @throws ClassNotFoundException if an object read from the stream can not be loaded
      */
     private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
         in.defaultReadObject();
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/SingletonMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/SingletonMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/SingletonMap.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/SingletonMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -53,8 +53,9 @@
  * <li>the <code>KeyValue</code> interface (just cast - no object creation)
  * </ul>
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  * @since 3.1
- * @version $Id: SingletonMap.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class SingletonMap<K, V>
         implements OrderedMap<K, V>, BoundedMap<K, V>, KeyValue<K, V>, Serializable, Cloneable {
@@ -133,6 +134,7 @@
      *
      * @return the key
      */
+    @Override
     public K getKey() {
         return key;
     }
@@ -142,6 +144,7 @@
      *
      * @return the value
      */
+    @Override
     public V getValue() {
         return value;
     }
@@ -165,6 +168,7 @@
      *
      * @return true always
      */
+    @Override
     public boolean isFull() {
         return true;
     }
@@ -174,6 +178,7 @@
      *
      * @return 1 always
      */
+    @Override
     public int maxSize() {
         return 1;
     }
@@ -186,6 +191,7 @@
      * @param key  the key
      * @return the mapped value, null if no match
      */
+    @Override
     public V get(final Object key) {
         if (isEqualKey(key)) {
             return value;
@@ -198,6 +204,7 @@
      *
      * @return the size of 1
      */
+    @Override
     public int size() {
         return 1;
     }
@@ -207,6 +214,7 @@
      *
      * @return false always
      */
+    @Override
     public boolean isEmpty() {
         return false;
     }
@@ -218,6 +226,7 @@
      * @param key  the key to search for
      * @return true if the map contains the key
      */
+    @Override
     public boolean containsKey(final Object key) {
         return isEqualKey(key);
     }
@@ -228,6 +237,7 @@
      * @param value  the value to search for
      * @return true if the map contains the key
      */
+    @Override
     public boolean containsValue(final Object value) {
         return isEqualValue(value);
     }
@@ -244,6 +254,7 @@
      * @return the value previously mapped to this key, null if none
      * @throws IllegalArgumentException if the key does not match
      */
+    @Override
     public V put(final K key, final V value) {
         if (isEqualKey(key)) {
             return setValue(value);
@@ -262,6 +273,7 @@
      * @throws NullPointerException if the map is null
      * @throws IllegalArgumentException if the key does not match
      */
+    @Override
     public void putAll(final Map<? extends K, ? extends V> map) {
         switch (map.size()) {
             case 0:
@@ -284,6 +296,7 @@
      * @return the value mapped to the removed key, null if key not in map
      * @throws UnsupportedOperationException always
      */
+    @Override
     public V remove(final Object key) {
         throw new UnsupportedOperationException();
     }
@@ -291,6 +304,7 @@
     /**
      * Unsupported operation.
      */
+    @Override
     public void clear() {
         throw new UnsupportedOperationException();
     }
@@ -303,8 +317,9 @@
      *
      * @return the entrySet view
      */
+    @Override
     public Set<Map.Entry<K, V>> entrySet() {
-        final Map.Entry<K, V> entry = new TiedMapEntry<K, V>(this, getKey());
+        final Map.Entry<K, V> entry = new TiedMapEntry<>(this, getKey());
         return Collections.singleton(entry);
     }
 
@@ -315,6 +330,7 @@
      *
      * @return the keySet view
      */
+    @Override
     public Set<K> keySet() {
         return Collections.singleton(key);
     }
@@ -326,15 +342,17 @@
      *
      * @return the values view
      */
+    @Override
     public Collection<V> values() {
-        return new SingletonValues<V>(this);
+        return new SingletonValues<>(this);
     }
 
     /**
      * {@inheritDoc}
      */
+    @Override
     public OrderedMapIterator<K, V> mapIterator() {
-        return new SingletonMapIterator<K, V>(this);
+        return new SingletonMapIterator<>(this);
     }
 
     /**
@@ -342,6 +360,7 @@
      *
      * @return the key
      */
+    @Override
     public K firstKey() {
         return getKey();
     }
@@ -351,6 +370,7 @@
      *
      * @return the key
      */
+    @Override
     public K lastKey() {
         return getKey();
     }
@@ -361,6 +381,7 @@
      * @param key  the next key
      * @return null always
      */
+    @Override
     public K nextKey(final K key) {
         return null;
     }
@@ -371,6 +392,7 @@
      * @param key  the next key
      * @return null always
      */
+    @Override
     public K previousKey(final K key) {
         return null;
     }
@@ -410,10 +432,12 @@
             this.parent = parent;
         }
 
+        @Override
         public boolean hasNext() {
             return hasNext;
         }
 
+        @Override
         public K next() {
             if (hasNext == false) {
                 throw new NoSuchElementException(AbstractHashedMap.NO_NEXT_ENTRY);
@@ -423,10 +447,12 @@
             return parent.getKey();
         }
 
+        @Override
         public boolean hasPrevious() {
             return hasNext == false;
         }
 
+        @Override
         public K previous() {
             if (hasNext == true) {
                 throw new NoSuchElementException(AbstractHashedMap.NO_PREVIOUS_ENTRY);
@@ -435,10 +461,12 @@
             return parent.getKey();
         }
 
+        @Override
         public void remove() {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public K getKey() {
             if (canGetSet == false) {
                 throw new IllegalStateException(AbstractHashedMap.GETKEY_INVALID);
@@ -446,6 +474,7 @@
             return parent.getKey();
         }
 
+        @Override
         public V getValue() {
             if (canGetSet == false) {
                 throw new IllegalStateException(AbstractHashedMap.GETVALUE_INVALID);
@@ -453,6 +482,7 @@
             return parent.getValue();
         }
 
+        @Override
         public V setValue(final V value) {
             if (canGetSet == false) {
                 throw new IllegalStateException(AbstractHashedMap.SETVALUE_INVALID);
@@ -460,6 +490,7 @@
             return parent.setValue(value);
         }
 
+        @Override
         public void reset() {
             hasNext = true;
         }
@@ -504,7 +535,7 @@
         }
         @Override
         public Iterator<V> iterator() {
-            return new SingletonIterator<V>(parent.getValue(), false);
+            return new SingletonIterator<>(parent.getValue(), false);
         }
     }
 
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/StaticBucketMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/StaticBucketMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/StaticBucketMap.java	2013-04-30 19:56:11.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/StaticBucketMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -90,8 +90,9 @@
  * iterations, or if you can make your own guarantees about how bulk
  * operations will affect the map.<p>
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  * @since 3.0 (previously in main package v2.1)
- * @version $Id: StaticBucketMap.java 1477799 2013-04-30 19:56:11Z tn $
  */
 public final class StaticBucketMap<K, V> extends AbstractIterableMap<K, V> {
 
@@ -171,6 +172,7 @@
      *
      * @return the current size
      */
+    @Override
     public int size() {
         int cnt = 0;
 
@@ -187,6 +189,7 @@
      *
      * @return true if empty
      */
+    @Override
     public boolean isEmpty() {
         return (size() == 0);
     }
@@ -197,6 +200,7 @@
      * @param key  the key to retrieve
      * @return the associated value
      */
+    @Override
     public V get(final Object key) {
         final int hash = getHash(key);
 
@@ -220,6 +224,7 @@
      * @param key  the key to check
      * @return true if found
      */
+    @Override
     public boolean containsKey(final Object key) {
         final int hash = getHash(key);
 
@@ -243,6 +248,7 @@
      * @param value  the value to check
      * @return true if found
      */
+    @Override
     public boolean containsValue(final Object value) {
         for (int i = 0; i < buckets.length; i++) {
             synchronized (locks[i]) {
@@ -268,6 +274,7 @@
      * @param value  the value to use
      * @return the previous mapping for the key
      */
+    @Override
     public V put(final K key, final V value) {
         final int hash = getHash(key);
 
@@ -275,7 +282,7 @@
             Node<K, V> n = buckets[hash];
 
             if (n == null) {
-                n = new Node<K, V>();
+                n = new Node<>();
                 n.key = key;
                 n.value = value;
                 buckets[hash] = n;
@@ -298,7 +305,7 @@
 
             // The key was not found in the current list of nodes, add it to the end
             //  in a new node.
-            final Node<K, V> newNode = new Node<K, V>();
+            final Node<K, V> newNode = new Node<>();
             newNode.key = key;
             newNode.value = value;
             n.next = newNode;
@@ -313,6 +320,7 @@
      * @param key  the key to remove
      * @return the previous value at this key
      */
+    @Override
     public V remove(final Object key) {
         final int hash = getHash(key);
 
@@ -347,6 +355,7 @@
      *
      * @return the key set
      */
+    @Override
     public Set<K> keySet() {
         return new KeySet();
     }
@@ -356,6 +365,7 @@
      *
      * @return the values
      */
+    @Override
     public Collection<V> values() {
         return new Values();
     }
@@ -365,6 +375,7 @@
      *
      * @return the entry set
      */
+    @Override
     public Set<Map.Entry<K, V>> entrySet() {
         return new EntrySet();
     }
@@ -376,6 +387,7 @@
      *
      * @param map  the map of entries to add
      */
+    @Override
     public void putAll(final Map<? extends K, ? extends V> map) {
         for (final Map.Entry<? extends K, ? extends V> entry : map.entrySet()) {
             put(entry.getKey(), entry.getValue());
@@ -385,6 +397,7 @@
     /**
      * Clears the map of all entries.
      */
+    @Override
     public void clear() {
         for (int i = 0; i < buckets.length; i++) {
             final Lock lock = locks[i];
@@ -444,10 +457,12 @@
         protected V value;
         protected Node<K, V> next;
 
+        @Override
         public K getKey() {
             return key;
         }
 
+        @Override
         public V getValue() {
             return value;
         }
@@ -473,6 +488,7 @@
                 (value == null ? e2.getValue() == null : value.equals(e2.getValue())));
         }
 
+        @Override
         public V setValue(final V obj) {
             final V retVal = value;
             value = obj;
@@ -489,7 +505,7 @@
 
     //-----------------------------------------------------------------------
     private class BaseIterator {
-        private final ArrayList<Map.Entry<K, V>> current = new ArrayList<Map.Entry<K,V>>();
+        private final ArrayList<Map.Entry<K, V>> current = new ArrayList<>();
         private int bucket;
         private Map.Entry<K, V> last;
 
@@ -532,6 +548,7 @@
 
     private class EntryIterator extends BaseIterator implements Iterator<Map.Entry<K, V>> {
 
+        @Override
         public Map.Entry<K, V> next() {
             return nextEntry();
         }
@@ -540,6 +557,7 @@
 
     private class ValueIterator extends BaseIterator implements Iterator<V> {
 
+        @Override
         public V next() {
             return nextEntry().getValue();
         }
@@ -548,6 +566,7 @@
 
     private class KeyIterator extends BaseIterator implements Iterator<K> {
 
+        @Override
         public K next() {
             return nextEntry().getKey();
         }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/TransformedMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/TransformedMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/TransformedMap.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/TransformedMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -40,10 +40,12 @@
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  * <p>
- * @see org.apache.commons.collections4.splitmap.TransformedSplitMap
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
+ *
+ * @see org.apache.commons.collections4.splitmap.TransformedSplitMap
  * @since 3.0
- * @version $Id: TransformedMap.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class TransformedMap<K, V>
         extends AbstractInputCheckedMapDecorator<K, V>
@@ -76,7 +78,7 @@
     public static <K, V> TransformedMap<K, V> transformingMap(final Map<K, V> map,
             final Transformer<? super K, ? extends K> keyTransformer,
             final Transformer<? super V, ? extends V> valueTransformer) {
-        return new TransformedMap<K, V>(map, keyTransformer, valueTransformer);
+        return new TransformedMap<>(map, keyTransformer, valueTransformer);
     }
 
     /**
@@ -99,7 +101,7 @@
     public static <K, V> TransformedMap<K, V> transformedMap(final Map<K, V> map,
             final Transformer<? super K, ? extends K> keyTransformer,
             final Transformer<? super V, ? extends V> valueTransformer) {
-        final TransformedMap<K, V> decorated = new TransformedMap<K, V>(map, keyTransformer, valueTransformer);
+        final TransformedMap<K, V> decorated = new TransformedMap<>(map, keyTransformer, valueTransformer);
         if (map.size() > 0) {
             final Map<K, V> transformed = decorated.transformMap(map);
             decorated.clear();
@@ -132,7 +134,7 @@
      * Write the map out using a custom routine.
      *
      * @param out  the output stream
-     * @throws IOException
+     * @throws IOException if an error occurs while writing to the stream
      * @since 3.1
      */
     private void writeObject(final ObjectOutputStream out) throws IOException {
@@ -144,8 +146,8 @@
      * Read the map in using a custom routine.
      *
      * @param in  the input stream
-     * @throws IOException
-     * @throws ClassNotFoundException
+     * @throws IOException if an error occurs while reading from the stream
+     * @throws ClassNotFoundException if an object read from the stream can not be loaded
      * @since 3.1
      */
     @SuppressWarnings("unchecked") // (1) should only fail if input stream is incorrect
@@ -198,7 +200,7 @@
         if (map.isEmpty()) {
             return (Map<K, V>) map;
         }
-        final Map<K, V> result = new LinkedMap<K, V>(map.size());
+        final Map<K, V> result = new LinkedMap<>(map.size());
 
         for (final Map.Entry<? extends K, ? extends V> entry : map.entrySet()) {
             result.put(transformKey(entry.getKey()), transformValue(entry.getValue()));
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/TransformedSortedMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/TransformedSortedMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/TransformedSortedMap.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/TransformedSortedMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -38,8 +38,9 @@
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  * @since 3.0
- * @version $Id: TransformedSortedMap.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class TransformedSortedMap<K, V>
         extends TransformedMap<K, V>
@@ -66,7 +67,7 @@
     public static <K, V> TransformedSortedMap<K, V> transformingSortedMap(final SortedMap<K, V> map,
             final Transformer<? super K, ? extends K> keyTransformer,
             final Transformer<? super V, ? extends V> valueTransformer) {
-        return new TransformedSortedMap<K, V>(map, keyTransformer, valueTransformer);
+        return new TransformedSortedMap<>(map, keyTransformer, valueTransformer);
     }
 
     /**
@@ -91,7 +92,7 @@
             final Transformer<? super V, ? extends V> valueTransformer) {
 
         final TransformedSortedMap<K, V> decorated =
-                new TransformedSortedMap<K, V>(map, keyTransformer, valueTransformer);
+                new TransformedSortedMap<>(map, keyTransformer, valueTransformer);
         if (map.size() > 0) {
             final Map<K, V> transformed = decorated.transformMap(map);
             decorated.clear();
@@ -129,31 +130,37 @@
     }
 
     //-----------------------------------------------------------------------
+    @Override
     public K firstKey() {
         return getSortedMap().firstKey();
     }
 
+    @Override
     public K lastKey() {
         return getSortedMap().lastKey();
     }
 
+    @Override
     public Comparator<? super K> comparator() {
         return getSortedMap().comparator();
     }
 
+    @Override
     public SortedMap<K, V> subMap(final K fromKey, final K toKey) {
         final SortedMap<K, V> map = getSortedMap().subMap(fromKey, toKey);
-        return new TransformedSortedMap<K, V>(map, keyTransformer, valueTransformer);
+        return new TransformedSortedMap<>(map, keyTransformer, valueTransformer);
     }
 
+    @Override
     public SortedMap<K, V> headMap(final K toKey) {
         final SortedMap<K, V> map = getSortedMap().headMap(toKey);
-        return new TransformedSortedMap<K, V>(map, keyTransformer, valueTransformer);
+        return new TransformedSortedMap<>(map, keyTransformer, valueTransformer);
     }
 
+    @Override
     public SortedMap<K, V> tailMap(final K fromKey) {
         final SortedMap<K, V> map = getSortedMap().tailMap(fromKey);
-        return new TransformedSortedMap<K, V>(map, keyTransformer, valueTransformer);
+        return new TransformedSortedMap<>(map, keyTransformer, valueTransformer);
     }
 
 }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/UnmodifiableEntrySet.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/UnmodifiableEntrySet.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/UnmodifiableEntrySet.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/UnmodifiableEntrySet.java	2018-07-08 00:18:18.000000000 +0000
@@ -32,8 +32,10 @@
  * <p>
  * Attempts to modify it will result in an UnsupportedOperationException.
  *
+ * @param <K> the type of the keys in the map
+ * @param <V> the type of the values in the map
+ *
  * @since 3.0
- * @version $Id: UnmodifiableEntrySet.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public final class UnmodifiableEntrySet<K, V>
         extends AbstractSetDecorator<Map.Entry<K, V>> implements Unmodifiable {
@@ -55,7 +57,7 @@
         if (set instanceof Unmodifiable) {
             return set;
         }
-        return new UnmodifiableEntrySet<K, V>(set);
+        return new UnmodifiableEntrySet<>(set);
     }
 
     //-----------------------------------------------------------------------
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/UnmodifiableMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/UnmodifiableMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/UnmodifiableMap.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/UnmodifiableMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -39,8 +39,9 @@
  * <p>
  * Attempts to modify it will result in an UnsupportedOperationException.
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  * @since 3.0
- * @version $Id: UnmodifiableMap.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public final class UnmodifiableMap<K, V>
         extends AbstractMapDecorator<K, V>
@@ -65,7 +66,7 @@
             final Map<K, V> tmpMap = (Map<K, V>) map;
             return tmpMap;
         }
-        return new UnmodifiableMap<K, V>(map);
+        return new UnmodifiableMap<>(map);
     }
 
     //-----------------------------------------------------------------------
@@ -85,7 +86,7 @@
      * Write the map out using a custom routine.
      *
      * @param out  the output stream
-     * @throws IOException
+     * @throws IOException if an error occurs while writing to the stream
      * @since 3.1
      */
     private void writeObject(final ObjectOutputStream out) throws IOException {
@@ -97,8 +98,8 @@
      * Read the map in using a custom routine.
      *
      * @param in  the input stream
-     * @throws IOException
-     * @throws ClassNotFoundException
+     * @throws IOException if an error occurs while reading from the stream
+     * @throws ClassNotFoundException if an object read from the stream can not be loaded
      * @since 3.1
      */
     @SuppressWarnings("unchecked")
@@ -134,7 +135,7 @@
             final MapIterator<K, V> it = ((IterableMap<K, V>) map).mapIterator();
             return UnmodifiableMapIterator.unmodifiableMapIterator(it);
         }
-        final MapIterator<K, V> it = new EntrySetMapIterator<K, V>(map);
+        final MapIterator<K, V> it = new EntrySetMapIterator<>(map);
         return UnmodifiableMapIterator.unmodifiableMapIterator(it);
     }
 
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/UnmodifiableOrderedMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/UnmodifiableOrderedMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/UnmodifiableOrderedMap.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/UnmodifiableOrderedMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -38,8 +38,9 @@
  * <p>
  * Attempts to modify it will result in an UnsupportedOperationException.
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  * @since 3.0
- * @version $Id: UnmodifiableOrderedMap.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public final class UnmodifiableOrderedMap<K, V> extends AbstractOrderedMapDecorator<K, V> implements
         Unmodifiable, Serializable {
@@ -63,7 +64,7 @@
             final OrderedMap<K, V> tmpMap = (OrderedMap<K, V>) map;
             return tmpMap;
         }
-        return new UnmodifiableOrderedMap<K, V>(map);
+        return new UnmodifiableOrderedMap<>(map);
     }
 
     //-----------------------------------------------------------------------
@@ -83,7 +84,7 @@
      * Write the map out using a custom routine.
      *
      * @param out  the output stream
-     * @throws IOException
+     * @throws IOException if an error occurs while writing to the stream
      * @since 3.1
      */
     private void writeObject(final ObjectOutputStream out) throws IOException {
@@ -95,8 +96,8 @@
      * Read the map in using a custom routine.
      *
      * @param in  the input stream
-     * @throws IOException
-     * @throws ClassNotFoundException
+     * @throws IOException if an error occurs while reading from the stream
+     * @throws ClassNotFoundException if an object read from the stream can not be loaded
      * @since 3.1
      */
     @SuppressWarnings("unchecked") // (1) should only fail if input stream is incorrect
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/UnmodifiableSortedMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/UnmodifiableSortedMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/map/UnmodifiableSortedMap.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/map/UnmodifiableSortedMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -37,8 +37,9 @@
  * <p>
  * Attempts to modify it will result in an UnsupportedOperationException.
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  * @since 3.0
- * @version $Id: UnmodifiableSortedMap.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public final class UnmodifiableSortedMap<K, V>
         extends AbstractSortedMapDecorator<K, V>
@@ -63,7 +64,7 @@
             final SortedMap<K, V> tmpMap = (SortedMap<K, V>) map;
             return tmpMap;
         }
-        return new UnmodifiableSortedMap<K, V>(map);
+        return new UnmodifiableSortedMap<>(map);
     }
 
     //-----------------------------------------------------------------------
@@ -83,7 +84,7 @@
      * Write the map out using a custom routine.
      *
      * @param out  the output stream
-     * @throws IOException
+     * @throws IOException if an error occurs while writing to the stream
      * @since 3.1
      */
     private void writeObject(final ObjectOutputStream out) throws IOException {
@@ -95,8 +96,8 @@
      * Read the map in using a custom routine.
      *
      * @param in  the input stream
-     * @throws IOException
-     * @throws ClassNotFoundException
+     * @throws IOException if an error occurs while reading from the stream
+     * @throws ClassNotFoundException if an object read from the stream can not be loaded
      * @since 3.1
      */
     @SuppressWarnings("unchecked")
@@ -159,17 +160,17 @@
 
     @Override
     public SortedMap<K, V> subMap(final K fromKey, final K toKey) {
-        return new UnmodifiableSortedMap<K, V>(decorated().subMap(fromKey, toKey));
+        return new UnmodifiableSortedMap<>(decorated().subMap(fromKey, toKey));
     }
 
     @Override
     public SortedMap<K, V> headMap(final K toKey) {
-        return new UnmodifiableSortedMap<K, V>(decorated().headMap(toKey));
+        return new UnmodifiableSortedMap<>(decorated().headMap(toKey));
     }
 
     @Override
     public SortedMap<K, V> tailMap(final K fromKey) {
-        return new UnmodifiableSortedMap<K, V>(decorated().tailMap(fromKey));
+        return new UnmodifiableSortedMap<>(decorated().tailMap(fromKey));
     }
 
 }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/MapIterator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/MapIterator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/MapIterator.java	2013-04-17 17:37:03.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/MapIterator.java	2018-07-08 00:18:18.000000000 +0000
@@ -31,19 +31,18 @@
  * In use, this iterator iterates through the keys in the map. After each call
  * to <code>next()</code>, the <code>getValue()</code> method provides direct
  * access to the value. The value can also be set using <code>setValue()</code>.
- * <pre>
+ * <pre>{@code
  * MapIterator<String,Integer> it = map.mapIterator();
  * while (it.hasNext()) {
  *   String key = it.next();
  *   Integer value = it.getValue();
  *   it.setValue(value + 1);
  * }
- * </pre>
+ * }</pre>
  *
  * @param <K> the type of the keys in the map
  * @param <V> the type of the values in the map
  * @since 3.0
- * @version $Id: MapIterator.java 1469004 2013-04-17 17:37:03Z tn $
  */
 public interface MapIterator<K, V> extends Iterator<K> {
 
@@ -52,6 +51,7 @@
      *
      * @return <code>true</code> if the iterator has more elements
      */
+    @Override
     boolean hasNext();
 
     /**
@@ -60,6 +60,7 @@
      * @return the next key in the iteration
      * @throws java.util.NoSuchElementException if the iteration is finished
      */
+    @Override
     K next();
 
     //-----------------------------------------------------------------------
@@ -92,6 +93,7 @@
      * @throws IllegalStateException if <code>remove()</code> has already been called
      *  since the last call to <code>next()</code>
      */
+    @Override
     void remove();
 
     /**
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/MapUtils.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/MapUtils.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/MapUtils.java	2015-06-22 19:48:47.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/MapUtils.java	2018-07-08 00:18:18.000000000 +0000
@@ -74,7 +74,6 @@
  *  </ul>
  *
  * @since 1.0
- * @version $Id: MapUtils.java 1686921 2015-06-22 19:48:47Z tn $
  */
 @SuppressWarnings("deprecation")
 public class MapUtils {
@@ -85,7 +84,7 @@
      */
     @SuppressWarnings("rawtypes")
     public static final SortedMap EMPTY_SORTED_MAP =
-            UnmodifiableSortedMap.unmodifiableSortedMap(new TreeMap<Object, Object>());
+            UnmodifiableSortedMap.unmodifiableSortedMap(new TreeMap<>());
 
     /**
      * String used to indent the verbose and debug Map prints.
@@ -376,7 +375,7 @@
 
     /**
      * Looks up the given key in the given map, converting the result into
-     * a string, using the default value if the the conversion fails.
+     * a string, using the default value if the conversion fails.
      *
      * @param <K>  the key type
      * @param map  the map whose value to look up
@@ -396,7 +395,7 @@
 
     /**
      * Looks up the given key in the given map, converting the result into
-     * a boolean, using the default value if the the conversion fails.
+     * a boolean, using the default value if the conversion fails.
      *
      * @param <K>  the key type
      * @param map  the map whose value to look up
@@ -416,7 +415,7 @@
 
     /**
      * Looks up the given key in the given map, converting the result into
-     * a number, using the default value if the the conversion fails.
+     * a number, using the default value if the conversion fails.
      *
      * @param <K>  the key type
      * @param map  the map whose value to look up
@@ -436,7 +435,7 @@
 
     /**
      * Looks up the given key in the given map, converting the result into
-     * a byte, using the default value if the the conversion fails.
+     * a byte, using the default value if the conversion fails.
      *
      * @param <K>  the key type
      * @param map  the map whose value to look up
@@ -456,7 +455,7 @@
 
     /**
      * Looks up the given key in the given map, converting the result into
-     * a short, using the default value if the the conversion fails.
+     * a short, using the default value if the conversion fails.
      *
      * @param <K>  the key type
      * @param map  the map whose value to look up
@@ -476,7 +475,7 @@
 
     /**
      * Looks up the given key in the given map, converting the result into
-     * an integer, using the default value if the the conversion fails.
+     * an integer, using the default value if the conversion fails.
      *
      * @param <K>  the key type
      * @param map  the map whose value to look up
@@ -496,7 +495,7 @@
 
     /**
      * Looks up the given key in the given map, converting the result into
-     * a long, using the default value if the the conversion fails.
+     * a long, using the default value if the conversion fails.
      *
      * @param <K>  the key type
      * @param map  the map whose value to look up
@@ -516,7 +515,7 @@
 
     /**
      * Looks up the given key in the given map, converting the result into
-     * a float, using the default value if the the conversion fails.
+     * a float, using the default value if the conversion fails.
      *
      * @param <K>  the key type
      * @param map  the map whose value to look up
@@ -536,7 +535,7 @@
 
     /**
      * Looks up the given key in the given map, converting the result into
-     * a double, using the default value if the the conversion fails.
+     * a double, using the default value if the conversion fails.
      *
      * @param <K>  the key type
      * @param map  the map whose value to look up
@@ -556,7 +555,7 @@
 
     /**
      * Looks up the given key in the given map, converting the result into
-     * a map, using the default value if the the conversion fails.
+     * a map, using the default value if the conversion fails.
      *
      * @param <K>  the key type
      * @param map  the map whose value to look up
@@ -707,7 +706,7 @@
     //-------------------------------------------------------------------------
     /**
      * Gets a boolean from a Map in a null-safe manner,
-     * using the default value if the the conversion fails.
+     * using the default value if the conversion fails.
      * <p>
      * If the value is a <code>Boolean</code> its value is returned.
      * If the value is a <code>String</code> and it equals 'true' ignoring case
@@ -732,7 +731,7 @@
 
     /**
      * Gets a byte from a Map in a null-safe manner,
-     * using the default value if the the conversion fails.
+     * using the default value if the conversion fails.
      * <p>
      * The byte is obtained from the results of {@link #getNumber(Map,Object)}.
      *
@@ -752,7 +751,7 @@
 
     /**
      * Gets a short from a Map in a null-safe manner,
-     * using the default value if the the conversion fails.
+     * using the default value if the conversion fails.
      * <p>
      * The short is obtained from the results of {@link #getNumber(Map,Object)}.
      *
@@ -772,7 +771,7 @@
 
     /**
      * Gets an int from a Map in a null-safe manner,
-     * using the default value if the the conversion fails.
+     * using the default value if the conversion fails.
      * <p>
      * The int is obtained from the results of {@link #getNumber(Map,Object)}.
      *
@@ -792,7 +791,7 @@
 
     /**
      * Gets a long from a Map in a null-safe manner,
-     * using the default value if the the conversion fails.
+     * using the default value if the conversion fails.
      * <p>
      * The long is obtained from the results of {@link #getNumber(Map,Object)}.
      *
@@ -812,7 +811,7 @@
 
     /**
      * Gets a float from a Map in a null-safe manner,
-     * using the default value if the the conversion fails.
+     * using the default value if the conversion fails.
      * <p>
      * The float is obtained from the results of {@link #getNumber(Map,Object)}.
      *
@@ -832,7 +831,7 @@
 
     /**
      * Gets a double from a Map in a null-safe manner,
-     * using the default value if the the conversion fails.
+     * using the default value if the conversion fails.
      * <p>
      * The double is obtained from the results of {@link #getNumber(Map,Object)}.
      *
@@ -888,7 +887,7 @@
      */
     public static Map<String, Object> toMap(final ResourceBundle resourceBundle) {
         final Enumeration<String> enumeration = resourceBundle.getKeys();
-        final Map<String, Object> map = new HashMap<String, Object>();
+        final Map<String, Object> map = new HashMap<>();
 
         while (enumeration.hasMoreElements()) {
             final String key = enumeration.nextElement();
@@ -953,7 +952,7 @@
      * If the debug flag is true, it additionally prints the type of the object
      * value.  If the contents of a map include the map itself, then the text
      * <em>(this Map)</em> is printed out.  If the contents include a
-     * parent container of the map, the the text <em>(ancestor[i] Map)</em> is
+     * parent container of the map, the text <em>(ancestor[i] Map)</em> is
      * printed, where i actually indicates the number of levels which must be
      * traversed in the sequential list of ancestors (e.g. father, grandfather,
      * great-grandfather, etc).
@@ -1065,7 +1064,7 @@
      * @throws NullPointerException if the map is null
      */
     public static <K, V> Map<V, K> invertMap(final Map<K, V> map) {
-        final Map<V, K> out = new HashMap<V, K>(map.size());
+        final Map<V, K> out = new HashMap<>(map.size());
         for (final Entry<K, V> entry : map.entrySet()) {
             out.put(entry.getValue(), entry.getKey());
         }
@@ -1765,7 +1764,7 @@
      * @param <K>  the key type
      * @param <V>  the value type
      * @param map to wrap if necessary.
-     * @return IterableMap<K, V>
+     * @return IterableMap&lt;K, V&gt;
      * @throws NullPointerException if map is null
      * @since 4.0
      */
@@ -1782,7 +1781,7 @@
      * @param <K>  the key type
      * @param <V>  the value type
      * @param sortedMap to wrap if necessary
-     * @return {@link IterableSortedMap}<K, V>
+     * @return {@link IterableSortedMap}&lt;K, V&gt;
      * @throws NullPointerException if sortedMap is null
      * @since 4.0
      */
@@ -1794,4 +1793,13 @@
                                                         new AbstractSortedMapDecorator<K, V>(sortedMap) {};
     }
 
+    /**
+     * Gets the given map size or 0 if the map is null
+     * @param map a Map or null
+     * @return the given map size or 0 if the map is null
+     */
+    public static int size(final Map<?, ?> map) {
+        return map == null ? 0 : map.size();
+    }
+
 }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/multimap/AbstractListValuedMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/multimap/AbstractListValuedMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/multimap/AbstractListValuedMap.java	2015-11-22 21:11:49.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/multimap/AbstractListValuedMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -32,8 +32,9 @@
  * Subclasses specify a Map implementation to use as the internal storage and
  * the List implementation to use as values.
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  * @since 4.1
- * @version $Id: AbstractListValuedMap.java 1715695 2015-11-22 21:11:49Z tn $
  */
 public abstract class AbstractListValuedMap<K, V> extends AbstractMultiValuedMap<K, V>
         implements ListValuedMap<K, V> {
@@ -97,7 +98,7 @@
      *   unmodifiable list for no mapping found.
      */
     @Override
-    public List<V> remove(Object key) {
+    public List<V> remove(final Object key) {
         return ListUtils.emptyIfNull(getMap().remove(key));
     }
 
@@ -117,7 +118,7 @@
         }
 
         @Override
-        public void add(int index, V value) {
+        public void add(final int index, final V value) {
             List<V> list = getMapping();
             if (list == null) {
                 list = createCollection();
@@ -127,11 +128,11 @@
         }
 
         @Override
-        public boolean addAll(int index, Collection<? extends V> c) {
+        public boolean addAll(final int index, final Collection<? extends V> c) {
             List<V> list = getMapping();
             if (list == null) {
                 list = createCollection();
-                boolean changed = list.addAll(index, c);
+                final boolean changed = list.addAll(index, c);
                 if (changed) {
                     getMap().put(key, list);
                 }
@@ -141,19 +142,19 @@
         }
 
         @Override
-        public V get(int index) {
+        public V get(final int index) {
             final List<V> list = ListUtils.emptyIfNull(getMapping());
             return list.get(index);
         }
 
         @Override
-        public int indexOf(Object o) {
+        public int indexOf(final Object o) {
             final List<V> list = ListUtils.emptyIfNull(getMapping());
             return list.indexOf(o);
         }
 
         @Override
-        public int lastIndexOf(Object o) {
+        public int lastIndexOf(final Object o) {
             final List<V> list = ListUtils.emptyIfNull(getMapping());
             return list.lastIndexOf(o);
         }
@@ -164,14 +165,14 @@
         }
 
         @Override
-        public ListIterator<V> listIterator(int index) {
+        public ListIterator<V> listIterator(final int index) {
             return new ValuesListIterator(key, index);
         }
 
         @Override
-        public V remove(int index) {
+        public V remove(final int index) {
             final List<V> list = ListUtils.emptyIfNull(getMapping());
-            V value = list.remove(index);
+            final V value = list.remove(index);
             if (list.isEmpty()) {
                 AbstractListValuedMap.this.remove(key);
             }
@@ -179,19 +180,19 @@
         }
 
         @Override
-        public V set(int index, V value) {
+        public V set(final int index, final V value) {
             final List<V> list = ListUtils.emptyIfNull(getMapping());
             return list.set(index, value);
         }
 
         @Override
-        public List<V> subList(int fromIndex, int toIndex) {
+        public List<V> subList(final int fromIndex, final int toIndex) {
             final List<V> list = ListUtils.emptyIfNull(getMapping());
             return list.subList(fromIndex, toIndex);
         }
 
         @Override
-        public boolean equals(Object other) {
+        public boolean equals(final Object other) {
             final List<V> list = getMapping();
             if (list == null) {
                 return Collections.emptyList().equals(other);
@@ -199,7 +200,7 @@
             if (!(other instanceof List)) {
                 return false;
             }
-            List<?> otherList = (List<?>) other;
+            final List<?> otherList = (List<?>) other;
             return ListUtils.isEqualList(list, otherList);
         }
 
@@ -224,16 +225,16 @@
             this.iterator = values.listIterator();
         }
 
-        public ValuesListIterator(final K key, int index) {
+        public ValuesListIterator(final K key, final int index) {
             this.key = key;
             this.values = ListUtils.emptyIfNull(getMap().get(key));
             this.iterator = values.listIterator(index);
         }
 
         @Override
-        public void add(V value) {
+        public void add(final V value) {
             if (getMap().get(key) == null) {
-                List<V> list = createCollection();
+                final List<V> list = createCollection();
                 getMap().put(key, list);
                 this.values = list;
                 this.iterator = list.listIterator();
@@ -280,7 +281,7 @@
         }
 
         @Override
-        public void set(V value) {
+        public void set(final V value) {
             iterator.set(value);
         }
 
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapDecorator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapDecorator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapDecorator.java	2015-11-19 23:08:01.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapDecorator.java	2018-07-08 00:18:18.000000000 +0000
@@ -37,7 +37,6 @@
  * @param <V> the type of value elements
  *
  * @since 4.1
- * @version $Id: AbstractMultiValuedMapDecorator.java 1715302 2015-11-19 23:08:01Z tn $
  */
 public abstract class AbstractMultiValuedMapDecorator<K, V>
         implements MultiValuedMap<K, V>, Serializable {
@@ -118,7 +117,7 @@
     }
 
     @Override
-    public boolean put(K key, V value) {
+    public boolean put(final K key, final V value) {
         return decorated().put(key, value);
     }
 
@@ -148,17 +147,17 @@
     }
 
     @Override
-    public boolean putAll(K key, Iterable<? extends V> values) {
+    public boolean putAll(final K key, final Iterable<? extends V> values) {
         return decorated().putAll(key, values);
     }
 
     @Override
-    public boolean putAll(Map<? extends K, ? extends V> map) {
+    public boolean putAll(final Map<? extends K, ? extends V> map) {
         return decorated().putAll(map);
     }
 
     @Override
-    public boolean putAll(MultiValuedMap<? extends K, ? extends V> map) {
+    public boolean putAll(final MultiValuedMap<? extends K, ? extends V> map) {
         return decorated().putAll(map);
     }
 
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMap.java	2015-11-22 21:20:04.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -51,8 +51,9 @@
  * <p>
  * Subclasses specify a Map implementation to use as the internal storage.
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  * @since 4.1
- * @version $Id: AbstractMultiValuedMap.java 1715697 2015-11-22 21:20:04Z tn $
  */
 public abstract class AbstractMultiValuedMap<K, V> implements MultiValuedMap<K, V> {
 
@@ -110,7 +111,7 @@
      * @param map the map to wrap
      */
     @SuppressWarnings("unchecked")
-    protected void setMap(Map<K, ? extends Collection<V>> map) {
+    protected void setMap(final Map<K, ? extends Collection<V>> map) {
         this.map = (Map<K, Collection<V>>) map;
     }
 
@@ -118,7 +119,7 @@
 
     // -----------------------------------------------------------------------
     @Override
-    public boolean containsKey(Object key) {
+    public boolean containsKey(final Object key) {
         return getMap().containsKey(key);
     }
 
@@ -128,8 +129,8 @@
     }
 
     @Override
-    public boolean containsMapping(Object key, Object value) {
-        Collection<V> coll = getMap().get(key);
+    public boolean containsMapping(final Object key, final Object value) {
+        final Collection<V> coll = getMap().get(key);
         return coll != null && coll.contains(value);
     }
 
@@ -164,7 +165,7 @@
      *   empty, unmodifiable collection for no mapping found
      */
     @Override
-    public Collection<V> remove(Object key) {
+    public Collection<V> remove(final Object key) {
         return CollectionUtils.emptyIfNull(getMap().remove(key));
     }
 
@@ -187,7 +188,7 @@
         if (coll == null) {
             return false;
         }
-        boolean changed = coll.remove(value);
+        final boolean changed = coll.remove(value);
         if (coll.isEmpty()) {
             getMap().remove(key);
         }
@@ -260,12 +261,10 @@
             if (coll.add(value)) {
                 map.put(key, coll);
                 return true;
-            } else {
-                return false;
             }
-        } else {
-            return coll.add(value);
+            return false;
         }
+        return coll.add(value);
     }
 
     /**
@@ -286,7 +285,7 @@
             throw new NullPointerException("Map must not be null.");
         }
         boolean changed = false;
-        for (Map.Entry<? extends K, ? extends V> entry : map.entrySet()) {
+        for (final Map.Entry<? extends K, ? extends V> entry : map.entrySet()) {
             changed |= put(entry.getKey(), entry.getValue());
         }
         return changed;
@@ -310,7 +309,7 @@
             throw new NullPointerException("Map must not be null.");
         }
         boolean changed = false;
-        for (Map.Entry<? extends K, ? extends V> entry : map.entries()) {
+        for (final Map.Entry<? extends K, ? extends V> entry : map.entries()) {
             changed |= put(entry.getKey(), entry.getValue());
         }
         return changed;
@@ -354,12 +353,11 @@
         }
 
         if (values instanceof Collection<?>) {
-            Collection<? extends V> valueCollection = (Collection<? extends V>) values;
+            final Collection<? extends V> valueCollection = (Collection<? extends V>) values;
             return !valueCollection.isEmpty() && get(key).addAll(valueCollection);
-        } else {
-            Iterator<? extends V> it = values.iterator();
-            return it.hasNext() && CollectionUtils.addAll(get(key), it);
         }
+        final Iterator<? extends V> it = values.iterator();
+        return it.hasNext() && CollectionUtils.addAll(get(key), it);
     }
 
     @Override
@@ -371,7 +369,7 @@
     }
 
     @Override
-    public boolean equals(Object obj) {
+    public boolean equals(final Object obj) {
         if (this == obj) {
             return true;
         }
@@ -416,7 +414,7 @@
         }
 
         @Override
-        public boolean add(V value) {
+        public boolean add(final V value) {
             Collection<V> coll = getMapping();
             if (coll == null) {
                 coll = createCollection();
@@ -426,7 +424,7 @@
         }
 
         @Override
-        public boolean addAll(Collection<? extends V> other) {
+        public boolean addAll(final Collection<? extends V> other) {
             Collection<V> coll = getMapping();
             if (coll == null) {
                 coll = createCollection();
@@ -461,13 +459,13 @@
         }
 
         @Override
-        public boolean contains(Object obj) {
+        public boolean contains(final Object obj) {
             final Collection<V> coll = getMapping();
             return coll == null ? false : coll.contains(obj);
         }
 
         @Override
-        public boolean containsAll(Collection<?> other) {
+        public boolean containsAll(final Collection<?> other) {
             final Collection<V> coll = getMapping();
             return coll == null ? false : coll.containsAll(other);
         }
@@ -479,13 +477,13 @@
         }
 
         @Override
-        public boolean remove(Object item) {
+        public boolean remove(final Object item) {
             final Collection<V> coll = getMapping();
             if (coll == null) {
                 return false;
             }
 
-            boolean result = coll.remove(item);
+            final boolean result = coll.remove(item);
             if (coll.isEmpty()) {
                 AbstractMultiValuedMap.this.remove(key);
             }
@@ -493,13 +491,13 @@
         }
 
         @Override
-        public boolean removeAll(Collection<?> c) {
+        public boolean removeAll(final Collection<?> c) {
             final Collection<V> coll = getMapping();
             if (coll == null) {
                 return false;
             }
 
-            boolean result = coll.removeAll(c);
+            final boolean result = coll.removeAll(c);
             if (coll.isEmpty()) {
                 AbstractMultiValuedMap.this.remove(key);
             }
@@ -507,13 +505,13 @@
         }
 
         @Override
-        public boolean retainAll(Collection<?> c) {
+        public boolean retainAll(final Collection<?> c) {
             final Collection<V> coll = getMapping();
             if (coll == null) {
                 return false;
             }
 
-            boolean result = coll.retainAll(c);
+            final boolean result = coll.retainAll(c);
             if (coll.isEmpty()) {
                 AbstractMultiValuedMap.this.remove(key);
             }
@@ -531,7 +529,7 @@
 
         @Override
         @SuppressWarnings("unchecked")
-        public <T> T[] toArray(T[] a) {
+        public <T> T[] toArray(final T[] a) {
             final Collection<V> coll = getMapping();
             if (coll == null) {
                 return (T[]) CollectionUtils.EMPTY_COLLECTION.toArray(a);
@@ -556,7 +554,7 @@
     private class KeysMultiSet extends AbstractMultiSet<K> {
 
         @Override
-        public boolean contains(Object o) {
+        public boolean contains(final Object o) {
             return getMap().containsKey(o);
         }
 
@@ -576,9 +574,9 @@
         }
 
         @Override
-        public int getCount(Object object) {
+        public int getCount(final Object object) {
             int count = 0;
-            Collection<V> col = AbstractMultiValuedMap.this.getMap().get(object);
+            final Collection<V> col = AbstractMultiValuedMap.this.getMap().get(object);
             if (col != null) {
                 count = col.size();
             }
@@ -619,11 +617,11 @@
         public Iterator<Entry<K, V>> iterator() {
             return new LazyIteratorChain<Entry<K, V>>() {
 
-                final Collection<K> keysCol = new ArrayList<K>(getMap().keySet());
+                final Collection<K> keysCol = new ArrayList<>(getMap().keySet());
                 final Iterator<K> keyIterator = keysCol.iterator();
 
                 @Override
-                protected Iterator<? extends Entry<K, V>> nextIterator(int count) {
+                protected Iterator<? extends Entry<K, V>> nextIterator(final int count) {
                     if (!keyIterator.hasNext()) {
                         return null;
                     }
@@ -636,7 +634,7 @@
                         }
 
                     };
-                    return new TransformIterator<V, Entry<K, V>>(new ValuesIterator(key), entryTransformer);
+                    return new TransformIterator<>(new ValuesIterator(key), entryTransformer);
                 }
             };
         }
@@ -653,12 +651,12 @@
      */
     private class MultiValuedMapEntry extends AbstractMapEntry<K, V> {
 
-        public MultiValuedMapEntry(K key, V value) {
+        public MultiValuedMapEntry(final K key, final V value) {
             super(key, value);
         }
 
         @Override
-        public V setValue(V value) {
+        public V setValue(final V value) {
             throw new UnsupportedOperationException();
         }
 
@@ -710,7 +708,7 @@
         }
 
         @Override
-        public V setValue(V value) {
+        public V setValue(final V value) {
             if (current == null) {
                 throw new IllegalStateException();
             }
@@ -725,7 +723,7 @@
     private class Values extends AbstractCollection<V> {
         @Override
         public Iterator<V> iterator() {
-            final IteratorChain<V> chain = new IteratorChain<V>();
+            final IteratorChain<V> chain = new IteratorChain<>();
             for (final K k : keySet()) {
                 chain.addIterator(new ValuesIterator(k));
             }
@@ -792,17 +790,18 @@
         }
 
         @Override
-        public boolean containsKey(Object key) {
+        public boolean containsKey(final Object key) {
             return decoratedMap.containsKey(key);
         }
 
         @Override
-        public Collection<V> get(Object key) {
-          Collection<V> collection = decoratedMap.get(key);
+        public Collection<V> get(final Object key) {
+          final Collection<V> collection = decoratedMap.get(key);
           if (collection == null) {
             return null;
           }
           @SuppressWarnings("unchecked")
+        final
           K k = (K) key;
           return wrappedCollection(k);
         }
@@ -818,8 +817,8 @@
         }
 
         @Override
-        public Collection<V> remove(Object key) {
-          Collection<V> collection = decoratedMap.remove(key);
+        public Collection<V> remove(final Object key) {
+          final Collection<V> collection = decoratedMap.remove(key);
           if (collection == null) {
             return null;
           }
@@ -831,7 +830,7 @@
         }
 
         @Override
-        public boolean equals(Object object) {
+        public boolean equals(final Object object) {
           return this == object || decoratedMap.equals(object);
         }
 
@@ -868,16 +867,16 @@
             }
 
             @Override
-            public boolean contains(Object o) {
+            public boolean contains(final Object o) {
                 return decoratedMap.entrySet().contains(o);
             }
 
             @Override
-            public boolean remove(Object o) {
+            public boolean remove(final Object o) {
                 if (!contains(o)) {
                     return false;
                 }
-                Map.Entry<?, ?> entry = (Map.Entry<?, ?>) o;
+                final Map.Entry<?, ?> entry = (Map.Entry<?, ?>) o;
                 AbstractMultiValuedMap.this.remove(entry.getKey());
                 return true;
             }
@@ -888,7 +887,7 @@
          */
         class AsMapEntrySetIterator extends AbstractIteratorDecorator<Map.Entry<K, Collection<V>>> {
 
-            AsMapEntrySetIterator(Iterator<Map.Entry<K, Collection<V>>> iterator) {
+            AsMapEntrySetIterator(final Iterator<Map.Entry<K, Collection<V>>> iterator) {
                 super(iterator);
             }
 
@@ -896,7 +895,7 @@
             public Map.Entry<K, Collection<V>> next() {
                 final Map.Entry<K, Collection<V>> entry = super.next();
                 final K key = entry.getKey();
-                return new UnmodifiableMapEntry<K, Collection<V>>(key, wrappedCollection(key));
+                return new UnmodifiableMapEntry<>(key, wrappedCollection(key));
             }
         }
     }
@@ -935,6 +934,7 @@
             final int valueSize = in.readInt();
             for (int j = 0; j < valueSize; j++) {
                 @SuppressWarnings("unchecked") // see above
+                final
                 V value = (V) in.readObject();
                 values.add(value);
             }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/multimap/AbstractSetValuedMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/multimap/AbstractSetValuedMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/multimap/AbstractSetValuedMap.java	2015-11-22 21:11:49.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/multimap/AbstractSetValuedMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -30,8 +30,9 @@
  * Subclasses specify a Map implementation to use as the internal storage and
  * the Set implementation to use as values.
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  * @since 4.1
- * @version $Id: AbstractSetValuedMap.java 1715695 2015-11-22 21:11:49Z tn $
  */
 public abstract class AbstractSetValuedMap<K, V> extends AbstractMultiValuedMap<K, V>
     implements SetValuedMap<K, V> {
@@ -49,7 +50,7 @@
      * @param map  the map to wrap, must not be null
      * @throws NullPointerException if the map is null
      */
-    protected AbstractSetValuedMap(Map<K, ? extends Set<V>> map) {
+    protected AbstractSetValuedMap(final Map<K, ? extends Set<V>> map) {
         super(map);
     }
 
@@ -96,7 +97,7 @@
      *   unmodifiable set for no mapping found.
      */
     @Override
-    public Set<V> remove(Object key) {
+    public Set<V> remove(final Object key) {
         return SetUtils.emptyIfNull(getMap().remove(key));
     }
 
@@ -112,7 +113,7 @@
         }
 
         @Override
-        public boolean equals(Object other) {
+        public boolean equals(final Object other) {
             final Set<V> set = (Set<V>) getMapping();
             if (set == null) {
                 return Collections.emptySet().equals(other);
@@ -120,7 +121,7 @@
             if (!(other instanceof Set)) {
                 return false;
             }
-            Set<?> otherSet = (Set<?>) other;
+            final Set<?> otherSet = (Set<?>) other;
             return SetUtils.isEqualSet(set, otherSet);
         }
 
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMap.java	2015-11-21 10:09:31.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -37,8 +37,9 @@
  * concurrently, you must use appropriate synchronization. This class may throw
  * exceptions when accessed by concurrent threads without synchronization.
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  * @since 4.1
- * @version $Id: ArrayListValuedHashMap.java 1715492 2015-11-21 10:09:31Z tn $
  */
 public class ArrayListValuedHashMap<K, V> extends AbstractListValuedMap<K, V>
     implements Serializable {
@@ -75,7 +76,7 @@
      *
      * @param initialListCapacity  the initial capacity used for value collections
      */
-    public ArrayListValuedHashMap(int initialListCapacity) {
+    public ArrayListValuedHashMap(final int initialListCapacity) {
         this(DEFAULT_INITIAL_MAP_CAPACITY, initialListCapacity);
     }
 
@@ -86,7 +87,7 @@
      * @param initialMapCapacity  the initial hashmap capacity
      * @param initialListCapacity  the initial capacity used for value collections
      */
-    public ArrayListValuedHashMap(int initialMapCapacity, int initialListCapacity) {
+    public ArrayListValuedHashMap(final int initialMapCapacity, final int initialListCapacity) {
         super(new HashMap<K, ArrayList<V>>(initialMapCapacity));
         this.initialListCapacity = initialListCapacity;
     }
@@ -114,7 +115,7 @@
     // -----------------------------------------------------------------------
     @Override
     protected ArrayList<V> createCollection() {
-        return new ArrayList<V>(initialListCapacity);
+        return new ArrayList<>(initialListCapacity);
     }
 
     // -----------------------------------------------------------------------
@@ -122,19 +123,19 @@
      * Trims the capacity of all value collections to their current size.
      */
     public void trimToSize() {
-        for (Collection<V> coll : getMap().values()) {
+        for (final Collection<V> coll : getMap().values()) {
             final ArrayList<V> list = (ArrayList<V>) coll;
             list.trimToSize();
         }
     }
 
     // -----------------------------------------------------------------------
-    private void writeObject(ObjectOutputStream oos) throws IOException {
+    private void writeObject(final ObjectOutputStream oos) throws IOException {
         oos.defaultWriteObject();
         doWriteObject(oos);
     }
 
-    private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException {
+    private void readObject(final ObjectInputStream ois) throws IOException, ClassNotFoundException {
         ois.defaultReadObject();
         setMap(new HashMap<K, ArrayList<V>>());
         doReadObject(ois);
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/multimap/HashSetValuedHashMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/multimap/HashSetValuedHashMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/multimap/HashSetValuedHashMap.java	2015-11-21 10:09:31.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/multimap/HashSetValuedHashMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -36,8 +36,9 @@
  * concurrently, you must use appropriate synchronization. This class may throw
  * exceptions when accessed by concurrent threads without synchronization.
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  * @since 4.1
- * @version $Id: HashSetValuedHashMap.java 1715492 2015-11-21 10:09:31Z tn $
  */
 public class HashSetValuedHashMap<K, V> extends AbstractSetValuedMap<K, V>
     implements Serializable {
@@ -74,7 +75,7 @@
      *
      * @param initialSetCapacity  the initial capacity used for value collections
      */
-    public HashSetValuedHashMap(int initialSetCapacity) {
+    public HashSetValuedHashMap(final int initialSetCapacity) {
         this(DEFAULT_INITIAL_MAP_CAPACITY, initialSetCapacity);
     }
 
@@ -85,7 +86,7 @@
      * @param initialMapCapacity  the initial hashmap capacity
      * @param initialSetCapacity  the initial capacity used for value collections
      */
-    public HashSetValuedHashMap(int initialMapCapacity, int initialSetCapacity) {
+    public HashSetValuedHashMap(final int initialMapCapacity, final int initialSetCapacity) {
         super(new HashMap<K, HashSet<V>>(initialMapCapacity));
         this.initialSetCapacity = initialSetCapacity;
     }
@@ -113,16 +114,16 @@
     // -----------------------------------------------------------------------
     @Override
     protected HashSet<V> createCollection() {
-        return new HashSet<V>(initialSetCapacity);
+        return new HashSet<>(initialSetCapacity);
     }
 
     // -----------------------------------------------------------------------
-    private void writeObject(ObjectOutputStream oos) throws IOException {
+    private void writeObject(final ObjectOutputStream oos) throws IOException {
         oos.defaultWriteObject();
         doWriteObject(oos);
     }
 
-    private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException {
+    private void readObject(final ObjectInputStream ois) throws IOException, ClassNotFoundException {
         ois.defaultReadObject();
         setMap(new HashMap<K, HashSet<V>>());
         doReadObject(ois);
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/multimap/package-info.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/multimap/package-info.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/multimap/package-info.java	2015-11-19 23:08:01.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/multimap/package-info.java	2018-07-08 00:18:18.000000000 +0000
@@ -30,6 +30,5 @@
  *   <li>Unmodifiable - ensures the collection cannot be altered
  * </ul>
  *
- * @version $Id: package-info.java 1715302 2015-11-19 23:08:01Z tn $
  */
 package org.apache.commons.collections4.multimap;
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/multimap/TransformedMultiValuedMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/multimap/TransformedMultiValuedMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/multimap/TransformedMultiValuedMap.java	2015-11-19 23:08:01.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/multimap/TransformedMultiValuedMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -34,8 +34,9 @@
  * <p>
  * <strong>Note that TransformedMultiValuedMap is not synchronized and is not thread-safe.</strong>
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  * @since 4.1
- * @version $Id: TransformedMultiValuedMap.java 1715302 2015-11-19 23:08:01Z tn $
  */
 public class TransformedMultiValuedMap<K, V> extends AbstractMultiValuedMapDecorator<K, V> {
 
@@ -66,7 +67,7 @@
     public static <K, V> TransformedMultiValuedMap<K, V> transformingMap(final MultiValuedMap<K, V> map,
             final Transformer<? super K, ? extends K> keyTransformer,
             final Transformer<? super V, ? extends V> valueTransformer) {
-        return new TransformedMultiValuedMap<K, V>(map, keyTransformer, valueTransformer);
+        return new TransformedMultiValuedMap<>(map, keyTransformer, valueTransformer);
     }
 
     /**
@@ -89,9 +90,9 @@
             final Transformer<? super K, ? extends K> keyTransformer,
             final Transformer<? super V, ? extends V> valueTransformer) {
         final TransformedMultiValuedMap<K, V> decorated =
-                new TransformedMultiValuedMap<K, V>(map, keyTransformer, valueTransformer);
+                new TransformedMultiValuedMap<>(map, keyTransformer, valueTransformer);
         if (!map.isEmpty()) {
-            final MultiValuedMap<K, V> mapCopy = new ArrayListValuedHashMap<K, V>(map);
+            final MultiValuedMap<K, V> mapCopy = new ArrayListValuedHashMap<>(map);
             decorated.clear();
             decorated.putAll(mapCopy);
         }
@@ -170,7 +171,7 @@
             throw new NullPointerException("Map must not be null.");
         }
         boolean changed = false;
-        for (Map.Entry<? extends K, ? extends V> entry : map.entrySet()) {
+        for (final Map.Entry<? extends K, ? extends V> entry : map.entrySet()) {
             changed |= put(entry.getKey(), entry.getValue());
         }
         return changed;
@@ -182,7 +183,7 @@
             throw new NullPointerException("Map must not be null.");
         }
         boolean changed = false;
-        for (Map.Entry<? extends K, ? extends V> entry : map.entries()) {
+        for (final Map.Entry<? extends K, ? extends V> entry : map.entries()) {
             changed |= put(entry.getKey(), entry.getValue());
         }
         return changed;
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMap.java	2015-06-13 18:27:11.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -40,7 +40,6 @@
  * @param <V> the type of value elements
  *
  * @since 4.1
- * @version $Id: UnmodifiableMultiValuedMap.java 1685299 2015-06-13 18:27:11Z tn $
  */
 public final class UnmodifiableMultiValuedMap<K, V>
         extends AbstractMultiValuedMapDecorator<K, V> implements Unmodifiable {
@@ -61,11 +60,11 @@
      */
     @SuppressWarnings("unchecked")
     public static <K, V> UnmodifiableMultiValuedMap<K, V> unmodifiableMultiValuedMap(
-            MultiValuedMap<? extends K, ? extends V> map) {
+            final MultiValuedMap<? extends K, ? extends V> map) {
         if (map instanceof Unmodifiable) {
             return (UnmodifiableMultiValuedMap<K, V>) map;
         }
-        return new UnmodifiableMultiValuedMap<K, V>(map);
+        return new UnmodifiableMultiValuedMap<>(map);
     }
 
     /**
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/MultiMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/MultiMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/MultiMap.java	2015-06-01 22:41:31.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/MultiMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -39,8 +39,10 @@
  * These were added solely for documentation purposes and do not change the interface
  * as they were defined in the superinterface <code>Map</code> anyway.
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
+ *
  * @since 2.0
- * @version $Id: MultiMap.java 1683018 2015-06-01 22:41:31Z tn $
  * @deprecated since 4.1, use {@link MultiValuedMap} instead
  */
 @Deprecated
@@ -75,6 +77,7 @@
      *
      * @return the number of key-collection mappings in this map
      */
+    @Override
     int size();
 
     /**
@@ -96,6 +99,7 @@
      * @throws ClassCastException if the key is of an invalid type
      * @throws NullPointerException if the key is null and null keys are invalid
      */
+    @Override
     Object get(Object key); // Cannot use get(K key) as that does not properly implement Map#get
 
     /**
@@ -109,6 +113,7 @@
      * @throws ClassCastException if the value is of an invalid type
      * @throws NullPointerException if the value is null and null value are invalid
      */
+    @Override
     boolean containsValue(Object value);
 
     /**
@@ -127,6 +132,7 @@
      * @throws NullPointerException if the key or value is null and null is invalid
      * @throws IllegalArgumentException if the key or value is invalid
      */
+    @Override
     Object put(K key, Object value);
 
     /**
@@ -142,6 +148,7 @@
      * @throws ClassCastException if the key is of an invalid type
      * @throws NullPointerException if the key is null and null keys are invalid
      */
+    @Override
     Object remove(Object key); // Cannot use remove(K key) as that does not properly implement Map#remove
 
     /**
@@ -153,6 +160,7 @@
      *
      * @return a collection view of the values contained in this map
      */
+    @Override
     Collection<Object> values();
 
 }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/MultiMapUtils.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/MultiMapUtils.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/MultiMapUtils.java	2015-11-19 23:08:01.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/MultiMapUtils.java	2018-07-08 00:18:18.000000000 +0000
@@ -39,7 +39,6 @@
  * </ul>
  *
  * @since 4.1
- * @version $Id: MultiMapUtils.java 1715302 2015-11-19 23:08:01Z tn $
  */
 public class MultiMapUtils {
 
@@ -128,11 +127,11 @@
      */
     public static <K, V> List<V> getValuesAsList(final MultiValuedMap<K, V> map, final K key) {
         if (map != null) {
-            Collection<V> col = map.get(key);
+            final Collection<V> col = map.get(key);
             if (col instanceof List) {
                 return (List<V>) col;
             }
-            return new ArrayList<V>(col);
+            return new ArrayList<>(col);
         }
         return null;
     }
@@ -148,11 +147,11 @@
      */
     public static <K, V> Set<V> getValuesAsSet(final MultiValuedMap<K, V> map, final K key) {
         if (map != null) {
-            Collection<V> col = map.get(key);
+            final Collection<V> col = map.get(key);
             if (col instanceof Set) {
                 return (Set<V>) col;
             }
-            return new HashSet<V>(col);
+            return new HashSet<>(col);
         }
         return null;
     }
@@ -168,11 +167,11 @@
      */
     public static <K, V> Bag<V> getValuesAsBag(final MultiValuedMap<K, V> map, final K key) {
         if (map != null) {
-            Collection<V> col = map.get(key);
+            final Collection<V> col = map.get(key);
             if (col instanceof Bag) {
                 return (Bag<V>) col;
             }
-            return new HashBag<V>(col);
+            return new HashBag<>(col);
         }
         return null;
     }
@@ -189,7 +188,7 @@
      * @return a new <code>ListValuedMap</code>
      */
     public static <K, V> ListValuedMap<K, V> newListValuedHashMap() {
-        return new ArrayListValuedHashMap<K, V>();
+        return new ArrayListValuedHashMap<>();
     }
 
     /**
@@ -201,7 +200,7 @@
      * @return a new {@link SetValuedMap}
      */
     public static <K, V> SetValuedMap<K, V> newSetValuedHashMap() {
-        return new HashSetValuedHashMap<K, V>();
+        return new HashSetValuedHashMap<>();
     }
 
     // MultiValuedMap Decorators
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/multiset/AbstractMapMultiSet.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/multiset/AbstractMapMultiSet.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/multiset/AbstractMapMultiSet.java	2015-11-21 20:13:35.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/multiset/AbstractMapMultiSet.java	2018-07-08 00:18:18.000000000 +0000
@@ -35,8 +35,8 @@
  * map will be used to map multiset elements to a number; the number represents the
  * number of occurrences of that element in the multiset.
  *
+ * @param <E> the type held in the multiset
  * @since 4.1
- * @version $Id: AbstractMapMultiSet.java 1715563 2015-11-21 20:13:35Z tn $
  */
 public abstract class AbstractMapMultiSet<E> extends AbstractMultiSet<E> {
 
@@ -82,7 +82,7 @@
      *
      * @param map the map to wrap
      */
-    protected void setMap(Map<E, MutableInteger> map) {
+    protected void setMap(final Map<E, MutableInteger> map) {
         this.map = map;
     }
 
@@ -145,7 +145,7 @@
      */
     @Override
     public Iterator<E> iterator() {
-        return new MapBasedMultiSetIterator<E>(this);
+        return new MapBasedMultiSetIterator<>(this);
     }
 
     /**
@@ -221,7 +221,7 @@
         }
 
         final MutableInteger mut = map.get(object);
-        int oldCount = mut != null ? mut.value : 0;
+        final int oldCount = mut != null ? mut.value : 0;
 
         if (occurrences > 0) {
             modCount++;
@@ -256,7 +256,7 @@
         if (mut == null) {
             return 0;
         }
-        int oldCount = mut.value;
+        final int oldCount = mut.value;
         if (occurrences > 0) {
             modCount++;
             if (occurrences < mut.value) {
@@ -303,7 +303,7 @@
     //-----------------------------------------------------------------------
     @Override
     protected Iterator<E> createUniqueSetIterator() {
-        return new UniqueSetIterator<E>(getMap().keySet().iterator(), this);
+        return new UniqueSetIterator<>(getMap().keySet().iterator(), this);
     }
 
     @Override
@@ -313,7 +313,7 @@
 
     @Override
     protected Iterator<Entry<E>> createEntrySetIterator() {
-        return new EntrySetIterator<E>(map.entrySet().iterator(), this);
+        return new EntrySetIterator<>(map.entrySet().iterator(), this);
     }
 
     //-----------------------------------------------------------------------
@@ -395,7 +395,7 @@
 
         @Override
         public Entry<E> next() {
-            last = new MultiSetEntry<E>(decorated.next());
+            last = new MultiSetEntry<>(decorated.next());
             canRemove = true;
             return last;
         }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSetDecorator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSetDecorator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSetDecorator.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSetDecorator.java	2018-07-08 00:18:18.000000000 +0000
@@ -26,8 +26,8 @@
  * <p>
  * Methods are forwarded directly to the decorated multiset.
  *
+ * @param <E> the type held in the multiset
  * @since 4.1
- * @version $Id: AbstractMultiSetDecorator.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public abstract class AbstractMultiSetDecorator<E>
         extends AbstractCollectionDecorator<E> implements MultiSet<E> {
@@ -80,7 +80,7 @@
     }
 
     @Override
-    public int setCount(E object, int count) {
+    public int setCount(final E object, final int count) {
         return decorated().setCount(object, count);
     }
 
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSet.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSet.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSet.java	2015-11-21 20:13:35.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSet.java	2018-07-08 00:18:18.000000000 +0000
@@ -33,8 +33,8 @@
  * Abstract implementation of the {@link MultiSet} interface to simplify the
  * creation of subclass implementations.
  *
+ * @param <E> the type held in the multiset
  * @since 4.1
- * @version $Id: AbstractMultiSet.java 1715563 2015-11-21 20:13:35Z tn $
  */
 public abstract class AbstractMultiSet<E> extends AbstractCollection<E> implements MultiSet<E> {
 
@@ -59,7 +59,7 @@
     @Override
     public int size() {
         int totalSize = 0;
-        for (Entry<E> entry : entrySet()) {
+        for (final Entry<E> entry : entrySet()) {
             totalSize += entry.getCount();
         }
         return totalSize;
@@ -74,7 +74,7 @@
      */
     @Override
     public int getCount(final Object object) {
-        for (Entry<E> entry : entrySet()) {
+        for (final Entry<E> entry : entrySet()) {
             final E element = entry.getElement();
             if (element == object ||
                 element != null && element.equals(object)) {
@@ -90,7 +90,7 @@
             throw new IllegalArgumentException("Count must not be negative.");
         }
 
-        int oldCount = getCount(object);
+        final int oldCount = getCount(object);
         if (oldCount < count) {
             add(object, count - oldCount);
         } else {
@@ -120,7 +120,7 @@
      */
     @Override
     public Iterator<E> iterator() {
-        return new MultiSetIterator<E>(this);
+        return new MultiSetIterator<>(this);
     }
 
     /**
@@ -197,7 +197,7 @@
      */
     @Override
     public void clear() {
-        Iterator<Entry<E>> it = entrySet().iterator();
+        final Iterator<Entry<E>> it = entrySet().iterator();
         while (it.hasNext()) {
             it.next();
             it.remove();
@@ -246,7 +246,7 @@
      * @return a view of the set of unique elements
      */
     protected Set<E> createUniqueSet() {
-        return new UniqueSet<E>(this);
+        return new UniqueSet<>(this);
     }
 
     /**
@@ -258,7 +258,7 @@
     protected Iterator<E> createUniqueSetIterator() {
         final Transformer<Entry<E>, E> transformer = new Transformer<Entry<E>, E>() {
             @Override
-            public E transform(Entry<E> entry) {
+            public E transform(final Entry<E> entry) {
                 return entry.getElement();
             }
         };
@@ -284,7 +284,7 @@
      * @return a view of the set of entries
      */
     protected Set<Entry<E>> createEntrySet() {
-        return new EntrySet<E>(this);
+        return new EntrySet<>(this);
     }
 
     /**
@@ -412,7 +412,7 @@
     protected static abstract class AbstractEntry<E> implements Entry<E> {
 
         @Override
-        public boolean equals(Object object) {
+        public boolean equals(final Object object) {
           if (object instanceof Entry) {
             final Entry<?> other = (Entry<?>) object;
             final E element = this.getElement();
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/multiset/HashMultiSet.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/multiset/HashMultiSet.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/multiset/HashMultiSet.java	2015-11-21 20:13:35.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/multiset/HashMultiSet.java	2018-07-08 00:18:18.000000000 +0000
@@ -31,8 +31,8 @@
  * count of occurrences. Extra methods on the interface allow multiple copies
  * of an object to be added or removed at once.
  *
+ * @param <E> the type held in the multiset
  * @since 4.1
- * @version $Id: HashMultiSet.java 1715563 2015-11-21 20:13:35Z tn $
  */
 public class HashMultiSet<E> extends AbstractMapMultiSet<E> implements Serializable {
 
@@ -59,6 +59,9 @@
     //-----------------------------------------------------------------------
     /**
      * Write the multiset out using a custom routine.
+     *
+     * @param out  the output stream
+     * @throws IOException if an error occurs while writing to the stream
      */
     private void writeObject(final ObjectOutputStream out) throws IOException {
         out.defaultWriteObject();
@@ -67,6 +70,10 @@
 
     /**
      * Read the multiset in using a custom routine.
+     *
+     * @param in the input stream
+     * @throws IOException if an error occurs while reading from the stream
+     * @throws ClassNotFoundException if an object read from the stream can not be loaded
      */
     private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
         in.defaultReadObject();
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/multiset/package-info.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/multiset/package-info.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/multiset/package-info.java	2015-06-29 21:28:54.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/multiset/package-info.java	2018-07-08 00:18:18.000000000 +0000
@@ -16,14 +16,12 @@
  */
 /**
  * This package contains implementations of the
- * {@link org.apache.commons.collections4.MultiSet MultiSet} and
- * {@link org.apache.commons.collections4.SortedMultiSet SortedMultiSet} interfaces.
+ * {@link org.apache.commons.collections4.MultiSet MultiSet} interface.
  * A multiset stores an object and a count of the number of occurrences of the object.
  * <p>
  * The following implementations are provided in the package:
  * <ul>
  *   <li>HashMultiSet - implementation that uses a HashMap to store the data
- *   <li>TreeMultiSet - implementation that uses a TreeMap to store the data
  * </ul>
  * <p>
  * The following decorators are provided in the package:
@@ -33,6 +31,5 @@
  *   <li>Unmodifiable - ensures the multiset cannot be altered
  * </ul>
  *
- * @version $Id: package-info.java 1688308 2015-06-29 21:28:54Z tn $
  */
 package org.apache.commons.collections4.multiset;
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/multiset/PredicatedMultiSet.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/multiset/PredicatedMultiSet.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/multiset/PredicatedMultiSet.java	2015-06-29 21:28:54.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/multiset/PredicatedMultiSet.java	2018-07-08 00:18:18.000000000 +0000
@@ -38,8 +38,8 @@
  *                                            NotNullPredicate.notNullPredicate());
  * </pre>
  *
+ * @param <E> the type held in the multiset
  * @since 4.1
- * @version $Id: PredicatedMultiSet.java 1688308 2015-06-29 21:28:54Z tn $
  */
 public class PredicatedMultiSet<E> extends PredicatedCollection<E> implements MultiSet<E> {
 
@@ -61,7 +61,7 @@
      */
     public static <E> PredicatedMultiSet<E> predicatedMultiSet(final MultiSet<E> multiset,
                                                                final Predicate<? super E> predicate) {
-        return new PredicatedMultiSet<E>(multiset, predicate);
+        return new PredicatedMultiSet<>(multiset, predicate);
     }
 
     //-----------------------------------------------------------------------
@@ -119,7 +119,7 @@
     }
 
     @Override
-    public int setCount(E object, int count) {
+    public int setCount(final E object, final int count) {
         validate(object);
         return decorated().setCount(object, count);
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/multiset/SynchronizedMultiSet.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/multiset/SynchronizedMultiSet.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/multiset/SynchronizedMultiSet.java	2015-11-15 10:06:16.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/multiset/SynchronizedMultiSet.java	2018-07-08 00:18:18.000000000 +0000
@@ -28,8 +28,8 @@
  * Methods are synchronized, then forwarded to the decorated multiset.
  * Iterators must be separately synchronized around the loop.
  *
+ * @param <E> the type held in the multiset
  * @since 4.1
- * @version $Id: SynchronizedMultiSet.java 1714424 2015-11-15 10:06:16Z tn $
  */
 public class SynchronizedMultiSet<E> extends SynchronizedCollection<E> implements MultiSet<E> {
 
@@ -45,7 +45,7 @@
      * @throws NullPointerException if multiset is null
      */
     public static <E> SynchronizedMultiSet<E> synchronizedMultiSet(final MultiSet<E> multiset) {
-        return new SynchronizedMultiSet<E>(multiset);
+        return new SynchronizedMultiSet<>(multiset);
     }
 
     //-----------------------------------------------------------------------
@@ -121,7 +121,7 @@
     }
 
     @Override
-    public int setCount(E object, int count) {
+    public int setCount(final E object, final int count) {
         synchronized (lock) {
             return decorated().setCount(object, count);
         }
@@ -131,7 +131,7 @@
     public Set<E> uniqueSet() {
         synchronized (lock) {
             final Set<E> set = decorated().uniqueSet();
-            return new SynchronizedSet<E>(set, lock);
+            return new SynchronizedSet<>(set, lock);
         }
     }
 
@@ -139,7 +139,7 @@
     public Set<Entry<E>> entrySet() {
         synchronized (lock) {
             final Set<MultiSet.Entry<E>> set = decorated().entrySet();
-            return new SynchronizedSet<MultiSet.Entry<E>>(set, lock);
+            return new SynchronizedSet<>(set, lock);
         }
     }
 
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/multiset/UnmodifiableMultiSet.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/multiset/UnmodifiableMultiSet.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/multiset/UnmodifiableMultiSet.java	2015-06-11 22:05:50.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/multiset/UnmodifiableMultiSet.java	2018-07-08 00:18:18.000000000 +0000
@@ -33,8 +33,8 @@
  * <p>
  * Attempts to modify it will result in an UnsupportedOperationException.
  *
+ * @param <E> the type held in the multiset
  * @since 4.1
- * @version $Id: UnmodifiableMultiSet.java 1684982 2015-06-11 22:05:50Z tn $
  */
 public final class UnmodifiableMultiSet<E>
         extends AbstractMultiSetDecorator<E> implements Unmodifiable {
@@ -58,7 +58,7 @@
             final MultiSet<E> tmpMultiSet = (MultiSet<E>) multiset;
             return tmpMultiSet;
         }
-        return new UnmodifiableMultiSet<E>(multiset);
+        return new UnmodifiableMultiSet<>(multiset);
     }
 
     //-----------------------------------------------------------------------
@@ -78,7 +78,7 @@
      * Write the collection out using a custom routine.
      *
      * @param out  the output stream
-     * @throws IOException
+     * @throws IOException if an error occurs while writing to the stream
      */
     private void writeObject(final ObjectOutputStream out) throws IOException {
         out.defaultWriteObject();
@@ -89,8 +89,8 @@
      * Read the collection in using a custom routine.
      *
      * @param in  the input stream
-     * @throws IOException
-     * @throws ClassNotFoundException
+     * @throws IOException if an error occurs while reading from the stream
+     * @throws ClassNotFoundException if an object read from the stream can not be loaded
      * @throws ClassCastException if deserialised object has wrong type
      */
     @SuppressWarnings("unchecked") // will throw CCE, see Javadoc
@@ -137,7 +137,7 @@
 
     //-----------------------------------------------------------------------
     @Override
-    public int setCount(E object, int count) {
+    public int setCount(final E object, final int count) {
         throw new UnsupportedOperationException();
     }
 
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/MultiSet.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/MultiSet.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/MultiSet.java	2015-11-15 10:06:16.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/MultiSet.java	2018-07-08 00:18:18.000000000 +0000
@@ -30,7 +30,6 @@
  *
  * @param <E> the type held in the multiset
  * @since 4.1
- * @version $Id: MultiSet.java 1714424 2015-11-15 10:06:16Z tn $
  */
 public interface MultiSet<E> extends Collection<E> {
 
@@ -241,7 +240,7 @@
          * and the two entries represent the same element with the same
          * number of occurrences.
          * <p>
-         * More formally, two entries <tt>e1</tt> and <tt>e2</tt> represent
+         * More formally, two entries <code>e1</code> and <code>e2</code> represent
          * the same mapping if
          * <pre>
          *     (e1.getElement()==null ? e2.getElement()==null
@@ -258,7 +257,7 @@
         /**
          * Returns the hash code value for this multiset entry.
          * <p>
-         * The hash code of a multiset entry <tt>e</tt> is defined to be:
+         * The hash code of a multiset entry <code>e</code> is defined to be:
          * <pre>
          *      (e==null ? 0 : e.hashCode()) ^ noOccurances)
          * </pre>
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/MultiSetUtils.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/MultiSetUtils.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/MultiSetUtils.java	2015-11-15 10:06:16.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/MultiSetUtils.java	2018-07-08 00:18:18.000000000 +0000
@@ -25,7 +25,6 @@
  * Provides utility methods and decorators for {@link MultiSet} instances.
  *
  * @since 4.1
- * @version $Id: MultiSetUtils.java 1714424 2015-11-15 10:06:16Z tn $
  */
 public class MultiSetUtils {
 
@@ -34,7 +33,7 @@
      */
     @SuppressWarnings("rawtypes") // OK, empty multiset is compatible with any type
     public static final MultiSet EMPTY_MULTISET =
-        UnmodifiableMultiSet.unmodifiableMultiSet(new HashMultiSet<Object>());
+        UnmodifiableMultiSet.unmodifiableMultiSet(new HashMultiSet<>());
 
     /**
      * Instantiation of MultiSetUtils is not intended or required.
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/MultiValuedMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/MultiValuedMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/MultiValuedMap.java	2015-11-25 20:27:24.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/MultiValuedMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -42,8 +42,9 @@
  * <code>coll</code> will be a collection containing "A", "B", "C".
  * <p>
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  * @since 4.1
- * @version $Id: MultiValuedMap.java 1716537 2015-11-25 20:27:24Z tn $
  */
 public interface MultiValuedMap<K, V> {
     // Query operations
@@ -299,7 +300,7 @@
      * Changes to the returned map or the collections that serve as its values
      * will update the underlying multi-valued map, and vice versa. The map does
      * not support {@code put} or {@code putAll}, nor do its entries support
-     * {@link Map.Entry#setValue setValue}.
+     * {@link java.util.Map.Entry#setValue(Object) setValue}.
      *
      * @return a map view of the mappings in this multi-valued map
      */
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/OrderedBidiMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/OrderedBidiMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/OrderedBidiMap.java	2013-11-19 00:47:22.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/OrderedBidiMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -27,7 +27,6 @@
  * @param <V> the type of the values in the map
  *
  * @since 3.0
- * @version $Id: OrderedBidiMap.java 1543260 2013-11-19 00:47:22Z ggregory $
  */
 public interface OrderedBidiMap<K, V> extends BidiMap<K, V>, OrderedMap<K, V> {
 
@@ -46,6 +45,7 @@
      *
      * @return an inverted bidirectional map
      */
+    @Override
     OrderedBidiMap<V, K> inverseBidiMap();
 
 }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/OrderedIterator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/OrderedIterator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/OrderedIterator.java	2013-04-17 17:37:03.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/OrderedIterator.java	2018-07-08 00:18:18.000000000 +0000
@@ -25,7 +25,6 @@
  *
  * @param <E> the type to iterate over
  * @since 3.0
- * @version $Id: OrderedIterator.java 1469004 2013-04-17 17:37:03Z tn $
  */
 public interface OrderedIterator<E> extends Iterator<E> {
 
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/OrderedMapIterator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/OrderedMapIterator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/OrderedMapIterator.java	2013-04-17 17:37:03.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/OrderedMapIterator.java	2018-07-08 00:18:18.000000000 +0000
@@ -24,7 +24,6 @@
  * @param <K> the type of the keys in the map
  * @param <V> the type of the values in the map
  * @since 3.0
- * @version $Id: OrderedMapIterator.java 1469004 2013-04-17 17:37:03Z tn $
  */
 public interface OrderedMapIterator<K, V> extends MapIterator<K, V>, OrderedIterator<K> {
 
@@ -33,6 +32,7 @@
      *
      * @return <code>true</code> if the iterator has a previous element
      */
+    @Override
     boolean hasPrevious();
 
     /**
@@ -41,6 +41,7 @@
      * @return the previous key in the iteration
      * @throws java.util.NoSuchElementException if the iteration is finished
      */
+    @Override
     K previous();
 
 }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/OrderedMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/OrderedMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/OrderedMap.java	2013-11-19 00:47:07.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/OrderedMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -24,7 +24,6 @@
  * @param <V> the type of the values in the map
  *
  * @since 3.0
- * @version $Id: OrderedMap.java 1543259 2013-11-19 00:47:07Z ggregory $
  */
 public interface OrderedMap<K, V> extends IterableMap<K, V> {
 
@@ -36,6 +35,7 @@
      *
      * @return a map iterator
      */
+    @Override
     OrderedMapIterator<K, V> mapIterator();
 
     /**
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/overview.html libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/overview.html
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/overview.html	2013-04-17 17:37:03.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/overview.html	2018-07-08 00:18:18.000000000 +0000
@@ -1,4 +1,4 @@
-<!-- $Id: overview.html 1469004 2013-04-17 17:37:03Z tn $ -->
+<!-- $Id$ -->
  <!--
    Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/package-info.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/package-info.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/package-info.java	2013-04-17 17:37:03.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/package-info.java	2018-07-08 00:18:18.000000000 +0000
@@ -22,6 +22,5 @@
  *   <li>ArrayStack - a non synchronized Stack that follows the same API as {@code java.util Stack}
  * </ul>
  *
- * @version $Id: package-info.java 1469004 2013-04-17 17:37:03Z tn $
  */
 package org.apache.commons.collections4;
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/Predicate.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/Predicate.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/Predicate.java	2013-11-19 00:47:45.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/Predicate.java	2018-07-08 00:18:18.000000000 +0000
@@ -31,7 +31,6 @@
  * @param <T> the type that the predicate queries
  *
  * @since 1.0
- * @version $Id: Predicate.java 1543262 2013-11-19 00:47:45Z ggregory $
  */
 public interface Predicate<T> {
 
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/PredicateUtils.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/PredicateUtils.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/PredicateUtils.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/PredicateUtils.java	2018-07-08 00:18:18.000000000 +0000
@@ -67,7 +67,6 @@
  * All the supplied predicates are Serializable.
  *
  * @since 3.0
- * @version $Id: PredicateUtils.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class PredicateUtils {
 
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/properties/package-info.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/properties/package-info.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/properties/package-info.java	1970-01-01 00:00:00.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/properties/package-info.java	2018-07-08 00:18:18.000000000 +0000
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * This package contains classes to extend or customize the behavior of
+ * {@link java.util.Properties Properties}.
+ * <p>
+ * The following classes are provided in the package:
+ * <ul>
+ *   <li>SortedProperties- A drop-in replacement for Properties for sorting keys.</li>
+ * </ul>
+ */
+package org.apache.commons.collections4.properties;
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/properties/SortedProperties.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/properties/SortedProperties.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/properties/SortedProperties.java	1970-01-01 00:00:00.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/properties/SortedProperties.java	2018-07-08 00:18:18.000000000 +0000
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.commons.collections4.properties;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+
+import org.apache.commons.collections4.iterators.IteratorEnumeration;
+
+/**
+ * A drop-in replacement for {@link Properties} for sorting keys.
+ * <p>
+ * Overrides {@link Properties#keys()} to sort keys. Allows other methods on the superclass to work with sorted keys.
+ * </p>
+ *
+ * @since 4.2
+ */
+public class SortedProperties extends Properties {
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public synchronized Enumeration<Object> keys() {
+        final Set<Object> keySet = keySet();
+        final List<String> keys = new ArrayList<>(keySet.size());
+        for (final Object key : keySet) {
+            keys.add(key.toString());
+        }
+        Collections.sort(keys);
+        return new IteratorEnumeration<Object>(keys.iterator());
+    }
+}
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/Put.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/Put.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/Put.java	2013-11-19 00:45:55.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/Put.java	2018-07-08 00:18:18.000000000 +0000
@@ -27,9 +27,10 @@
  * of, a "reading" interface) and thus defines {@link #put(Object, Object)} as returning
  * {@link Object}.
  *
- * @since 4.0
- * @version $Id: Put.java 1543257 2013-11-19 00:45:55Z ggregory $
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  *
+ * @since 4.0
  * @see Get
  */
 public interface Put<K, V> {
@@ -43,11 +44,19 @@
      * Note that the return type is Object, rather than V as in the Map interface.
      * See the class Javadoc for further info.
      *
+     * @param key key with which the specified value is to be associated
+     * @param value value to be associated with the specified key
+     * @return the previous value associated with <code>key</code>, or
+     *         <code>null</code> if there was no mapping for <code>key</code>.
+     *         (A <code>null</code> return can also indicate that the map
+     *         previously associated <code>null</code> with <code>key</code>,
+     *         if the implementation supports <code>null</code> values.)
      * @see Map#put(Object, Object)
      */
     Object put(K key, V value);
 
     /**
+     * @param t mappings to be stored in this map
      * @see Map#putAll(Map)
      */
     void putAll(Map<? extends K, ? extends V> t);
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/queue/AbstractQueueDecorator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/queue/AbstractQueueDecorator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/queue/AbstractQueueDecorator.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/queue/AbstractQueueDecorator.java	2018-07-08 00:18:18.000000000 +0000
@@ -33,7 +33,6 @@
  *
  * @param <E> the type of the elements in the queue
  * @since 4.0
- * @version $Id: AbstractQueueDecorator.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public abstract class AbstractQueueDecorator<E> extends AbstractCollectionDecorator<E>
         implements Queue<E> {
@@ -70,22 +69,27 @@
 
     //-----------------------------------------------------------------------
 
+    @Override
     public boolean offer(final E obj) {
         return decorated().offer(obj);
     }
 
+    @Override
     public E poll() {
         return decorated().poll();
     }
 
+    @Override
     public E peek() {
         return decorated().peek();
     }
 
+    @Override
     public E element() {
         return decorated().element();
     }
 
+    @Override
     public E remove() {
         return decorated().remove();
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/queue/CircularFifoQueue.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/queue/CircularFifoQueue.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/queue/CircularFifoQueue.java	2015-01-01 22:01:31.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/queue/CircularFifoQueue.java	2018-07-08 00:18:18.000000000 +0000
@@ -43,8 +43,8 @@
  * <p>
  * This queue prevents null objects from being added.
  *
+ * @param <E> the type of elements in this collection
  * @since 4.0
- * @version $Id: CircularFifoQueue.java 1648957 2015-01-01 22:01:31Z tn $
  */
 public class CircularFifoQueue<E> extends AbstractCollection<E>
     implements Queue<E>, BoundedCollection<E>, Serializable {
@@ -185,6 +185,7 @@
      *
      * @return always returns {@code false}
      */
+    @Override
     public boolean isFull() {
         return false;
     }
@@ -205,6 +206,7 @@
      *
      * @return the maximum number of elements the collection can hold
      */
+    @Override
     public int maxSize() {
         return maxElements;
     }
@@ -280,10 +282,12 @@
      * @return true, always
      * @throws NullPointerException  if the given element is null
      */
-    public boolean offer(E element) {
+    @Override
+    public boolean offer(final E element) {
         return add(element);
     }
 
+    @Override
     public E poll() {
         if (isEmpty()) {
             return null;
@@ -291,6 +295,7 @@
         return remove();
     }
 
+    @Override
     public E element() {
         if (isEmpty()) {
             throw new NoSuchElementException("queue is empty");
@@ -298,6 +303,7 @@
         return peek();
     }
 
+    @Override
     public E peek() {
         if (isEmpty()) {
             return null;
@@ -305,6 +311,7 @@
         return elements[start];
     }
 
+    @Override
     public E remove() {
         if (isEmpty()) {
             throw new NoSuchElementException("queue is empty");
@@ -364,10 +371,12 @@
             private int lastReturnedIndex = -1;
             private boolean isFirst = full;
 
+            @Override
             public boolean hasNext() {
                 return isFirst || index != end;
             }
 
+            @Override
             public E next() {
                 if (!hasNext()) {
                     throw new NoSuchElementException();
@@ -378,6 +387,7 @@
                 return elements[lastReturnedIndex];
             }
 
+            @Override
             public void remove() {
                 if (lastReturnedIndex == -1) {
                     throw new IllegalStateException();
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/queue/package-info.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/queue/package-info.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/queue/package-info.java	2013-04-30 18:37:37.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/queue/package-info.java	2018-07-08 00:18:18.000000000 +0000
@@ -29,6 +29,5 @@
  *   <li>Unmodifiable - ensures the collection cannot be altered
  * </ul>
  *
- * @version $Id: package-info.java 1477765 2013-04-30 18:37:37Z tn $
  */
 package org.apache.commons.collections4.queue;
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/queue/PredicatedQueue.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/queue/PredicatedQueue.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/queue/PredicatedQueue.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/queue/PredicatedQueue.java	2018-07-08 00:18:18.000000000 +0000
@@ -32,8 +32,8 @@
  * One usage would be to ensure that no null entries are added to the queue.
  * <pre>Queue queue = PredicatedQueue.predicatedQueue(new UnboundedFifoQueue(), NotNullPredicate.INSTANCE);</pre>
  *
+ * @param <E> the type of elements held in this queue
  * @since 4.0
- * @version $Id: PredicatedQueue.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class PredicatedQueue<E> extends PredicatedCollection<E> implements Queue<E> {
 
@@ -55,7 +55,7 @@
      */
     public static <E> PredicatedQueue<E> predicatedQueue(final Queue<E> Queue,
                                                           final Predicate<? super E> predicate) {
-        return new PredicatedQueue<E>(Queue, predicate);
+        return new PredicatedQueue<>(Queue, predicate);
     }
 
     //-----------------------------------------------------------------------
@@ -94,23 +94,28 @@
      * @return the result of adding to the underlying queue
      * @throws IllegalArgumentException if the add is invalid
      */
+    @Override
     public boolean offer(final E object) {
         validate(object);
         return decorated().offer(object);
     }
 
+    @Override
     public E poll() {
         return decorated().poll();
     }
 
+    @Override
     public E peek() {
         return decorated().peek();
     }
 
+    @Override
     public E element() {
         return decorated().element();
     }
 
+    @Override
     public E remove() {
         return decorated().remove();
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/queue/SynchronizedQueue.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/queue/SynchronizedQueue.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/queue/SynchronizedQueue.java	1970-01-01 00:00:00.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/queue/SynchronizedQueue.java	2018-07-08 00:18:18.000000000 +0000
@@ -0,0 +1,143 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.collections4.queue;
+
+import java.util.Queue;
+
+import org.apache.commons.collections4.collection.SynchronizedCollection;
+
+/**
+ * Decorates another {@link Queue} to synchronize its behaviour for a multi-threaded environment.
+ * <p>
+ * Methods are synchronized, then forwarded to the decorated queue. Iterators must be separately synchronized around the
+ * loop.
+ *
+ * @param <E> the type of the elements in the collection
+ * @since 4.2
+ */
+public class SynchronizedQueue<E> extends SynchronizedCollection<E> implements Queue<E> {
+
+    /** Serialization version */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Factory method to create a synchronized queue.
+     *
+     * @param <E>
+     *            the type of the elements in the queue
+     * @param queue
+     *            the queue to decorate, must not be null
+     * @return a new synchronized Queue
+     * @throws NullPointerException
+     *             if queue is null
+     */
+    public static <E> SynchronizedQueue<E> synchronizedQueue(final Queue<E> queue) {
+        return new SynchronizedQueue<>(queue);
+    }
+
+    // -----------------------------------------------------------------------
+    /**
+     * Constructor that wraps (not copies).
+     *
+     * @param queue
+     *            the queue to decorate, must not be null
+     * @throws NullPointerException
+     *             if queue is null
+     */
+    protected SynchronizedQueue(final Queue<E> queue) {
+        super(queue);
+    }
+
+    /**
+     * Constructor that wraps (not copies).
+     *
+     * @param queue
+     *            the queue to decorate, must not be null
+     * @param lock
+     *            the lock to use, must not be null
+     * @throws NullPointerException
+     *             if queue or lock is null
+     */
+    protected SynchronizedQueue(final Queue<E> queue, final Object lock) {
+        super(queue, lock);
+    }
+
+    /**
+     * Gets the queue being decorated.
+     *
+     * @return the decorated queue
+     */
+    @Override
+    protected Queue<E> decorated() {
+        return (Queue<E>) super.decorated();
+    }
+
+    @Override
+    public E element() {
+        synchronized (lock) {
+            return decorated().element();
+        }
+    }
+
+    @Override
+    public boolean equals(final Object object) {
+        if (object == this) {
+            return true;
+        }
+        synchronized (lock) {
+            return decorated().equals(object);
+        }
+    }
+
+    // -----------------------------------------------------------------------
+
+    @Override
+    public int hashCode() {
+        synchronized (lock) {
+            return decorated().hashCode();
+        }
+    }
+
+    @Override
+    public boolean offer(final E e) {
+        synchronized (lock) {
+            return decorated().offer(e);
+        }
+    }
+
+    @Override
+    public E peek() {
+        synchronized (lock) {
+            return decorated().peek();
+        }
+    }
+
+    @Override
+    public E poll() {
+        synchronized (lock) {
+            return decorated().poll();
+        }
+    }
+
+    @Override
+    public E remove() {
+        synchronized (lock) {
+            return decorated().remove();
+        }
+    }
+
+}
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/queue/TransformedQueue.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/queue/TransformedQueue.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/queue/TransformedQueue.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/queue/TransformedQueue.java	2018-07-08 00:18:18.000000000 +0000
@@ -29,8 +29,8 @@
  * For example, if the transformation converts Strings to Integers, you must
  * use the Integer form to remove objects.
  *
+ * @param <E> the type of elements held in this queue
  * @since 4.0
- * @version $Id: TransformedQueue.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class TransformedQueue<E> extends TransformedCollection<E> implements Queue<E> {
 
@@ -52,7 +52,7 @@
      */
     public static <E> TransformedQueue<E> transformingQueue(final Queue<E> queue,
                                                             final Transformer<? super E, ? extends E> transformer) {
-        return new TransformedQueue<E>(queue, transformer);
+        return new TransformedQueue<>(queue, transformer);
     }
 
     /**
@@ -73,7 +73,7 @@
     public static <E> TransformedQueue<E> transformedQueue(final Queue<E> queue,
                                                            final Transformer<? super E, ? extends E> transformer) {
         // throws IAE if queue or transformer is null
-        final TransformedQueue<E> decorated = new TransformedQueue<E>(queue, transformer);
+        final TransformedQueue<E> decorated = new TransformedQueue<>(queue, transformer);
         if (queue.size() > 0) {
             @SuppressWarnings("unchecked") // queue is type <E>
             final E[] values = (E[]) queue.toArray(); // NOPMD - false positive for generics
@@ -111,22 +111,27 @@
 
     //-----------------------------------------------------------------------
 
+    @Override
     public boolean offer(final E obj) {
         return getQueue().offer(transform(obj));
     }
 
+    @Override
     public E poll() {
         return getQueue().poll();
     }
 
+    @Override
     public E peek() {
         return getQueue().peek();
     }
 
+    @Override
     public E element() {
         return getQueue().element();
     }
 
+    @Override
     public E remove() {
         return getQueue().remove();
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/queue/UnmodifiableQueue.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/queue/UnmodifiableQueue.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/queue/UnmodifiableQueue.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/queue/UnmodifiableQueue.java	2018-07-08 00:18:18.000000000 +0000
@@ -31,8 +31,8 @@
  * <p>
  * Attempts to modify it will result in an UnsupportedOperationException.
  *
+ * @param <E> the type of elements held in this queue
  * @since 4.0
- * @version $Id: UnmodifiableQueue.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public final class UnmodifiableQueue<E>
         extends AbstractQueueDecorator<E>
@@ -57,7 +57,7 @@
             final Queue<E> tmpQueue = (Queue<E>) queue;
             return tmpQueue;
         }
-        return new UnmodifiableQueue<E>(queue);
+        return new UnmodifiableQueue<>(queue);
     }
 
     //-----------------------------------------------------------------------
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/QueueUtils.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/QueueUtils.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/QueueUtils.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/QueueUtils.java	2018-07-08 00:18:18.000000000 +0000
@@ -20,6 +20,7 @@
 import java.util.Queue;
 
 import org.apache.commons.collections4.queue.PredicatedQueue;
+import org.apache.commons.collections4.queue.SynchronizedQueue;
 import org.apache.commons.collections4.queue.TransformedQueue;
 import org.apache.commons.collections4.queue.UnmodifiableQueue;
 
@@ -27,7 +28,6 @@
  * Provides utility methods and decorators for {@link Queue} instances.
  *
  * @since 4.0
- * @version $Id: QueueUtils.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class QueueUtils {
 
@@ -35,7 +35,7 @@
      * An empty unmodifiable queue.
      */
     @SuppressWarnings("rawtypes") // OK, empty queue is compatible with any type
-    public static final Queue EMPTY_QUEUE = UnmodifiableQueue.unmodifiableQueue(new LinkedList<Object>());
+    public static final Queue EMPTY_QUEUE = UnmodifiableQueue.unmodifiableQueue(new LinkedList<>());
 
     /**
      * <code>QueueUtils</code> should not normally be instantiated.
@@ -45,6 +45,37 @@
     //-----------------------------------------------------------------------
 
     /**
+     * Returns a synchronized (thread-safe) queue backed by the given queue.
+     * In order to guarantee serial access, it is critical that all access to the
+     * backing queue is accomplished through the returned queue.
+     * <p>
+     * It is imperative that the user manually synchronize on the returned queue
+     * when iterating over it:
+     *
+     * <pre>
+     * Queue queue = QueueUtils.synchronizedQueue(new CircularFifoQueue());
+     * ...
+     * synchronized(queue) {
+     *     Iterator i = queue.iterator(); // Must be in synchronized block
+     *     while (i.hasNext())
+     *         foo(i.next());
+     *     }
+     * }
+     * </pre>
+     *
+     * Failure to follow this advice may result in non-deterministic behavior.
+     *
+     * @param <E> the element type
+     * @param queue the queue to synchronize, must not be null
+     * @return a synchronized queue backed by that queue
+     * @throws NullPointerException if the queue is null
+     * @since 4.2
+     */
+    public static <E> Queue<E> synchronizedQueue(final Queue<E> queue) {
+        return SynchronizedQueue.synchronizedQueue(queue);
+    }
+
+    /**
      * Returns an unmodifiable queue backed by the given queue.
      *
      * @param <E> the type of the elements in the queue
@@ -103,6 +134,6 @@
      */
     @SuppressWarnings("unchecked") // OK, empty queue is compatible with any type
     public static <E> Queue<E> emptyQueue() {
-        return (Queue<E>) EMPTY_QUEUE;
+        return EMPTY_QUEUE;
     }
 }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/ResettableIterator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/ResettableIterator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/ResettableIterator.java	2013-11-19 00:47:55.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/ResettableIterator.java	2018-07-08 00:18:18.000000000 +0000
@@ -25,7 +25,6 @@
  *
  * @param <E> the type to iterate over
  * @since 3.0
- * @version $Id: ResettableIterator.java 1543263 2013-11-19 00:47:55Z ggregory $
  */
 public interface ResettableIterator<E> extends Iterator<E> {
 
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/ResettableListIterator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/ResettableListIterator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/ResettableListIterator.java	2013-04-30 18:55:24.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/ResettableListIterator.java	2018-07-08 00:18:18.000000000 +0000
@@ -25,7 +25,6 @@
  *
  * @param <E> the type to iterate over
  * @since 3.0
- * @version $Id: ResettableListIterator.java 1477779 2013-04-30 18:55:24Z tn $
  */
 public interface ResettableListIterator<E> extends ListIterator<E>, ResettableIterator<E>, OrderedIterator<E> {
 
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/sequence/CommandVisitor.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/sequence/CommandVisitor.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/sequence/CommandVisitor.java	2013-04-30 18:34:03.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/sequence/CommandVisitor.java	2018-07-08 00:18:18.000000000 +0000
@@ -97,7 +97,7 @@
  *   }
  *
  *   private void display(String commandName, Object object) {
- *     System.out.println(commandName + " " + object + " ->" + this);
+ *     System.out.println(commandName + " " + object + " -&gt;" + this);
  *   }
  *
  *   public String toString() {
@@ -115,7 +115,6 @@
  * </pre>
  *
  * @since 4.0
- * @version $Id: CommandVisitor.java 1477760 2013-04-30 18:34:03Z tn $
  */
 public interface CommandVisitor<T> {
 
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/sequence/DeleteCommand.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/sequence/DeleteCommand.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/sequence/DeleteCommand.java	2013-04-30 18:34:03.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/sequence/DeleteCommand.java	2018-07-08 00:18:18.000000000 +0000
@@ -29,7 +29,6 @@
  * @see EditScript
  *
  * @since 4.0
- * @version $Id: DeleteCommand.java 1477760 2013-04-30 18:34:03Z tn $
  */
 public class DeleteCommand<T> extends EditCommand<T> {
 
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/sequence/EditCommand.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/sequence/EditCommand.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/sequence/EditCommand.java	2013-04-30 18:34:03.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/sequence/EditCommand.java	2018-07-08 00:18:18.000000000 +0000
@@ -43,7 +43,6 @@
  * @see EditScript
  *
  * @since 4.0
- * @version $Id: EditCommand.java 1477760 2013-04-30 18:34:03Z tn $
  */
 public abstract class EditCommand<T> {
 
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/sequence/EditScript.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/sequence/EditScript.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/sequence/EditScript.java	2013-04-30 18:34:03.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/sequence/EditScript.java	2018-07-08 00:18:18.000000000 +0000
@@ -41,7 +41,6 @@
  * @see ReplacementsHandler
  *
  * @since 4.0
- * @version $Id: EditScript.java 1477760 2013-04-30 18:34:03Z tn $
  */
 public class EditScript<T> {
 
@@ -58,7 +57,7 @@
      * Simple constructor. Creates a new empty script.
      */
     public EditScript() {
-        commands = new ArrayList<EditCommand<T>>();
+        commands = new ArrayList<>();
         lcsLength = 0;
         modifications = 0;
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/sequence/InsertCommand.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/sequence/InsertCommand.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/sequence/InsertCommand.java	2013-04-30 18:34:03.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/sequence/InsertCommand.java	2018-07-08 00:18:18.000000000 +0000
@@ -29,7 +29,6 @@
  * @see EditScript
  *
  * @since 4.0
- * @version $Id: InsertCommand.java 1477760 2013-04-30 18:34:03Z tn $
  */
 public class InsertCommand<T> extends EditCommand<T> {
 
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/sequence/KeepCommand.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/sequence/KeepCommand.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/sequence/KeepCommand.java	2013-04-30 18:34:03.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/sequence/KeepCommand.java	2018-07-08 00:18:18.000000000 +0000
@@ -29,7 +29,6 @@
  * @see EditScript
  *
  * @since 4.0
- * @version $Id: KeepCommand.java 1477760 2013-04-30 18:34:03Z tn $
  */
 public class KeepCommand<T> extends EditCommand<T> {
 
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/sequence/package-info.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/sequence/package-info.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/sequence/package-info.java	2013-05-05 15:21:44.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/sequence/package-info.java	2018-07-08 00:18:18.000000000 +0000
@@ -72,6 +72,5 @@
  * method is also provided. This allows the user to keep track of the current index in
  * both arrays if he needs so.
  *
- * @version $Id: package-info.java 1479338 2013-05-05 15:21:44Z tn $
  */
 package org.apache.commons.collections4.sequence;
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/sequence/ReplacementsFinder.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/sequence/ReplacementsFinder.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/sequence/ReplacementsFinder.java	2013-04-30 18:34:03.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/sequence/ReplacementsFinder.java	2018-07-08 00:18:18.000000000 +0000
@@ -46,7 +46,6 @@
  * @see SequencesComparator
  *
  * @since 4.0
- * @version $Id: ReplacementsFinder.java 1477760 2013-04-30 18:34:03Z tn $
  */
 public class ReplacementsFinder<T> implements CommandVisitor<T> {
 
@@ -63,8 +62,8 @@
      * @param handler  handler to call when synchronized sequences are found
      */
     public ReplacementsFinder(final ReplacementsHandler<T> handler) {
-        pendingInsertions = new ArrayList<T>();
-        pendingDeletions  = new ArrayList<T>();
+        pendingInsertions = new ArrayList<>();
+        pendingDeletions  = new ArrayList<>();
         skipped           = 0;
         this.handler      = handler;
     }
@@ -74,6 +73,7 @@
      *
      * @param object  object to insert
      */
+    @Override
     public void visitInsertCommand(final T object) {
         pendingInsertions.add(object);
     }
@@ -86,6 +86,7 @@
      *
      * @param object  synchronization object detected
      */
+    @Override
     public void visitKeepCommand(final T object) {
         if (pendingDeletions.isEmpty() && pendingInsertions.isEmpty()) {
             ++skipped;
@@ -102,6 +103,7 @@
      *
      * @param object  object to delete
      */
+    @Override
     public void visitDeleteCommand(final T object) {
         pendingDeletions.add(object);
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/sequence/ReplacementsHandler.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/sequence/ReplacementsHandler.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/sequence/ReplacementsHandler.java	2013-11-19 00:53:50.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/sequence/ReplacementsHandler.java	2018-07-08 00:18:18.000000000 +0000
@@ -23,7 +23,6 @@
  *
  * @see ReplacementsFinder
  * @since 4.0
- * @version $Id: ReplacementsHandler.java 1543277 2013-11-19 00:53:50Z ggregory $
  */
 public interface ReplacementsHandler<T> {
 
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/sequence/SequencesComparator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/sequence/SequencesComparator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/sequence/SequencesComparator.java	2013-11-10 22:19:29.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/sequence/SequencesComparator.java	2018-07-08 00:18:18.000000000 +0000
@@ -54,7 +54,6 @@
  * @see CommandVisitor
  *
  * @since 4.0
- * @version $Id: SequencesComparator.java 1540567 2013-11-10 22:19:29Z tn $
  */
 public class SequencesComparator<T> {
 
@@ -126,7 +125,7 @@
      *         sequences
      */
     public EditScript<T> getScript() {
-        final EditScript<T> script = new EditScript<T>();
+        final EditScript<T> script = new EditScript<>();
         buildScript(0, sequence1.size(), 0, sequence2.size(), script);
         return script;
     }
@@ -202,7 +201,7 @@
                 }
                 // Second step
                 if (delta % 2 != 0 && delta - d <= k && k <= delta + d) {
-                    if (vUp[i-delta] <= vDown[i]) {
+                    if (vUp[i-delta] <= vDown[i]) { // NOPMD
                         return buildSnake(vUp[i-delta], k + start1 - start2, end1, end2);
                     }
                 }
@@ -228,7 +227,7 @@
                 }
                 // Second step
                 if (delta % 2 == 0 && -d <= k && k <= d ) {
-                    if (vUp[i] <= vDown[i + delta]) {
+                    if (vUp[i] <= vDown[i + delta]) { // NOPMD
                         return buildSnake(vUp[i], k + start1 - start2, end1, end2);
                     }
                 }
@@ -262,15 +261,15 @@
             int j = start2;
             while (i < end1 || j < end2) {
                 if (i < end1 && j < end2 && equator.equate(sequence1.get(i), sequence2.get(j))) {
-                    script.append(new KeepCommand<T>(sequence1.get(i)));
+                    script.append(new KeepCommand<>(sequence1.get(i)));
                     ++i;
                     ++j;
                 } else {
                     if (end1 - start1 > end2 - start2) {
-                        script.append(new DeleteCommand<T>(sequence1.get(i)));
+                        script.append(new DeleteCommand<>(sequence1.get(i)));
                         ++i;
                     } else {
-                        script.append(new InsertCommand<T>(sequence2.get(j)));
+                        script.append(new InsertCommand<>(sequence2.get(j)));
                         ++j;
                     }
                 }
@@ -282,7 +281,7 @@
                         start2, middle.getStart() - middle.getDiag(),
                         script);
             for (int i = middle.getStart(); i < middle.getEnd(); ++i) {
-                script.append(new KeepCommand<T>(sequence1.get(i)));
+                script.append(new KeepCommand<>(sequence1.get(i)));
             }
             buildScript(middle.getEnd(), end1,
                         middle.getEnd() - middle.getDiag(), end2,
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/set/AbstractNavigableSetDecorator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/set/AbstractNavigableSetDecorator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/set/AbstractNavigableSetDecorator.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/set/AbstractNavigableSetDecorator.java	2018-07-08 00:18:18.000000000 +0000
@@ -26,7 +26,6 @@
  *
  * @param <E> the type of the elements in the navigable set
  * @since 4.1
- * @version $Id: AbstractNavigableSetDecorator.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public abstract class AbstractNavigableSetDecorator<E>
         extends AbstractSortedSetDecorator<E>
@@ -65,22 +64,22 @@
     //-----------------------------------------------------------------------
 
     @Override
-    public E lower(E e) {
+    public E lower(final E e) {
         return decorated().lower(e);
     }
 
     @Override
-    public E floor(E e) {
+    public E floor(final E e) {
         return decorated().floor(e);
     }
 
     @Override
-    public E ceiling(E e) {
+    public E ceiling(final E e) {
         return decorated().ceiling(e);
     }
 
     @Override
-    public E higher(E e) {
+    public E higher(final E e) {
         return decorated().higher(e);
     }
 
@@ -105,17 +104,18 @@
     }
 
     @Override
-    public NavigableSet<E> subSet(E fromElement, boolean fromInclusive, E toElement, boolean toInclusive) {
+    public NavigableSet<E> subSet(final E fromElement, final boolean fromInclusive, final E toElement,
+            final boolean toInclusive) {
         return decorated().subSet(fromElement, fromInclusive, toElement, toInclusive);
     }
 
     @Override
-    public NavigableSet<E> headSet(E toElement, boolean inclusive) {
+    public NavigableSet<E> headSet(final E toElement, final boolean inclusive) {
         return decorated().headSet(toElement, inclusive);
     }
 
     @Override
-    public NavigableSet<E> tailSet(E fromElement, boolean inclusive) {
+    public NavigableSet<E> tailSet(final E fromElement, final boolean inclusive) {
         return decorated().tailSet(fromElement, inclusive);
     }
 
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/set/AbstractSerializableSetDecorator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/set/AbstractSerializableSetDecorator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/set/AbstractSerializableSetDecorator.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/set/AbstractSerializableSetDecorator.java	2018-07-08 00:18:18.000000000 +0000
@@ -25,8 +25,8 @@
 /**
  * Serializable subclass of AbstractSetDecorator.
  *
+ * @param <E> the type of the elements in this set
  * @since 3.1
- * @version $Id: AbstractSerializableSetDecorator.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public abstract class AbstractSerializableSetDecorator<E>
         extends AbstractSetDecorator<E> {
@@ -49,7 +49,7 @@
      * Write the set out using a custom routine.
      *
      * @param out  the output stream
-     * @throws IOException
+     * @throws IOException if an error occurs while writing to the stream
      */
     private void writeObject(final ObjectOutputStream out) throws IOException {
         out.defaultWriteObject();
@@ -60,8 +60,8 @@
      * Read the set in using a custom routine.
      *
      * @param in  the input stream
-     * @throws IOException
-     * @throws ClassNotFoundException
+     * @throws IOException if an error occurs while reading from the stream
+     * @throws ClassNotFoundException if an object read from the stream can not be loaded
      */
     @SuppressWarnings("unchecked")
     private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/set/AbstractSetDecorator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/set/AbstractSetDecorator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/set/AbstractSetDecorator.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/set/AbstractSetDecorator.java	2018-07-08 00:18:18.000000000 +0000
@@ -25,9 +25,8 @@
  * <p>
  * Methods are forwarded directly to the decorated set.
  *
- * @param <E> the type of the elements in the set
+ * @param <E> the type of the elements in this set
  * @since 3.0
- * @version $Id: AbstractSetDecorator.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public abstract class AbstractSetDecorator<E> extends AbstractCollectionDecorator<E> implements
         Set<E> {
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/set/AbstractSortedSetDecorator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/set/AbstractSortedSetDecorator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/set/AbstractSortedSetDecorator.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/set/AbstractSortedSetDecorator.java	2018-07-08 00:18:18.000000000 +0000
@@ -27,7 +27,6 @@
  *
  * @param <E> the type of the elements in the sorted set
  * @since 3.0
- * @version $Id: AbstractSortedSetDecorator.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public abstract class AbstractSortedSetDecorator<E>
         extends AbstractSetDecorator<E>
@@ -65,26 +64,32 @@
     }
 
     //-----------------------------------------------------------------------
+    @Override
     public SortedSet<E> subSet(final E fromElement, final E toElement) {
         return decorated().subSet(fromElement, toElement);
     }
 
+    @Override
     public SortedSet<E> headSet(final E toElement) {
         return decorated().headSet(toElement);
     }
 
+    @Override
     public SortedSet<E> tailSet(final E fromElement) {
         return decorated().tailSet(fromElement);
     }
 
+    @Override
     public E first() {
         return decorated().first();
     }
 
+    @Override
     public E last() {
         return decorated().last();
     }
 
+    @Override
     public Comparator<? super E> comparator() {
         return decorated().comparator();
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/set/CompositeSet.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/set/CompositeSet.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/set/CompositeSet.java	2013-11-19 00:52:40.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/set/CompositeSet.java	2018-07-08 00:18:18.000000000 +0000
@@ -43,8 +43,8 @@
  * See <a href="https://issues.apache.org/jira/browse/COLLECTIONS-424">COLLECTIONS-424</a>
  * for more details.
  *
+ * @param <E> the type of the elements in this set
  * @since 3.0
- * @version $Id: CompositeSet.java 1543273 2013-11-19 00:52:40Z ggregory $
  */
 public class CompositeSet<E> implements Set<E>, Serializable {
 
@@ -55,7 +55,7 @@
     private SetMutator<E> mutator;
 
     /** Sets in the composite */
-    private final List<Set<E>> all = new ArrayList<Set<E>>();
+    private final List<Set<E>> all = new ArrayList<>();
 
     /**
      * Create an empty CompositeSet.
@@ -92,6 +92,7 @@
      *
      * @return total number of elements in all contained containers
      */
+    @Override
     public int size() {
         int size = 0;
         for (final Set<E> item : all) {
@@ -107,6 +108,7 @@
      *
      * @return true if all of the contained sets are empty
      */
+    @Override
     public boolean isEmpty() {
         for (final Set<E> item : all) {
             if (item.isEmpty() == false) {
@@ -124,6 +126,7 @@
      * @param obj  the object to search for
      * @return true if obj is contained in any of the contained sets
      */
+    @Override
     public boolean contains(final Object obj) {
         for (final Set<E> item : all) {
             if (item.contains(obj)) {
@@ -143,11 +146,12 @@
      *  the order they were added, but this behavior should not be relied upon.
      * @see IteratorChain
      */
+    @Override
     public Iterator<E> iterator() {
         if (all.isEmpty()) {
             return EmptyIterator.<E>emptyIterator();
         }
-        final IteratorChain<E> chain = new IteratorChain<E>();
+        final IteratorChain<E> chain = new IteratorChain<>();
         for (final Set<E> item : all) {
             chain.addIterator(item.iterator());
         }
@@ -159,6 +163,7 @@
      *
      * @return an object array of all the elements in the collection
      */
+    @Override
     public Object[] toArray() {
         final Object[] result = new Object[size()];
         int i = 0;
@@ -176,6 +181,7 @@
      * @param array  the array to use, populating if possible
      * @return an array of all the elements in the collection
      */
+    @Override
     @SuppressWarnings("unchecked")
     public <T> T[] toArray(final T[] array) {
         final int size = size();
@@ -209,6 +215,7 @@
      * @throws NullPointerException if the object cannot be added because its null
      * @throws IllegalArgumentException if the object cannot be added
      */
+    @Override
     public boolean add(final E obj) {
         if (mutator == null) {
            throw new UnsupportedOperationException(
@@ -224,6 +231,7 @@
      * @param obj  object to be removed
      * @return true if the object is removed, false otherwise
      */
+    @Override
     public boolean remove(final Object obj) {
         for (final Set<E> set : getSets()) {
             if (set.contains(obj)) {
@@ -242,6 +250,7 @@
      * @param coll  the collection to check for
      * @return true if all elements contained
      */
+    @Override
     public boolean containsAll(final Collection<?> coll) {
         for (final Object item : coll) {
             if (contains(item) == false) {
@@ -262,6 +271,7 @@
      * @throws NullPointerException if the object cannot be added because its null
      * @throws IllegalArgumentException if the object cannot be added
      */
+    @Override
     public boolean addAll(final Collection<? extends E> coll) {
         if (mutator == null) {
             throw new UnsupportedOperationException(
@@ -279,6 +289,7 @@
      * @return true if the composite was modified
      * @throws UnsupportedOperationException if removeAll is unsupported
      */
+    @Override
     public boolean removeAll(final Collection<?> coll) {
         if (coll.size() == 0) {
             return false;
@@ -300,6 +311,7 @@
      * @return true if the composite was modified
      * @throws UnsupportedOperationException if retainAll is unsupported
      */
+    @Override
     public boolean retainAll(final Collection<?> coll) {
         boolean changed = false;
         for (final Collection<E> item : all) {
@@ -315,6 +327,7 @@
      *
      * @throws UnsupportedOperationException if clear is unsupported
      */
+    @Override
     public void clear() {
         for (final Collection<E> coll : all) {
             coll.clear();
@@ -375,7 +388,7 @@
      * @param sets  the Sets to be appended to the composite
      */
     public void addComposited(final Set<E>... sets) {
-        for (Set<E> set : sets) {
+        for (final Set<E> set : sets) {
             addComposited(set);
         }
     }
@@ -397,7 +410,7 @@
      *   The new collection is <i>not</i> backed by this composite.
      */
     public Set<E> toSet() {
-        return new HashSet<E>(this);
+        return new HashSet<>(this);
     }
 
     /**
@@ -446,7 +459,7 @@
     /**
      * Define callbacks for mutation operations.
      */
-    public static interface SetMutator<E> extends Serializable {
+    public interface SetMutator<E> extends Serializable {
 
         /**
          * Called when an object is to be added to the composite.
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/set/ListOrderedSet.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/set/ListOrderedSet.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/set/ListOrderedSet.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/set/ListOrderedSet.java	2018-07-08 00:18:18.000000000 +0000
@@ -49,8 +49,8 @@
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  *
+ * @param <E> the type of the elements in this set
  * @since 3.0
- * @version $Id: ListOrderedSet.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class ListOrderedSet<E>
     extends AbstractSerializableSetDecorator<E> {
@@ -84,7 +84,7 @@
         if (set.size() > 0 || list.size() > 0) {
             throw new IllegalArgumentException("Set and List must be empty");
         }
-        return new ListOrderedSet<E>(set, list);
+        return new ListOrderedSet<>(set, list);
     }
 
     /**
@@ -99,7 +99,7 @@
      * @since 4.0
      */
     public static <E> ListOrderedSet<E> listOrderedSet(final Set<E> set) {
-        return new ListOrderedSet<E>(set);
+        return new ListOrderedSet<>(set);
     }
 
     /**
@@ -121,9 +121,9 @@
             throw new NullPointerException("List must not be null");
         }
         CollectionUtils.filter(list, UniquePredicate.uniquePredicate());
-        final Set<E> set = new HashSet<E>(list);
+        final Set<E> set = new HashSet<>(list);
 
-        return new ListOrderedSet<E>(set, list);
+        return new ListOrderedSet<>(set, list);
     }
 
     // -----------------------------------------------------------------------
@@ -135,7 +135,7 @@
      */
     public ListOrderedSet() {
         super(new HashSet<E>());
-        setOrder = new ArrayList<E>();
+        setOrder = new ArrayList<>();
     }
 
     /**
@@ -146,7 +146,7 @@
      */
     protected ListOrderedSet(final Set<E> set) {
         super(set);
-        setOrder = new ArrayList<E>(set);
+        setOrder = new ArrayList<>(set);
     }
 
     /**
@@ -186,7 +186,7 @@
 
     @Override
     public OrderedIterator<E> iterator() {
-        return new OrderedSetIterator<E>(setOrder.listIterator(), decorated());
+        return new OrderedSetIterator<>(setOrder.listIterator(), decorated());
     }
 
     @Override
@@ -236,14 +236,14 @@
      */
     @Override
     public boolean retainAll(final Collection<?> coll) {
-        boolean result = decorated().retainAll(coll);
+        final boolean result = decorated().retainAll(coll);
         if (result == false) {
             return false;
         }
         if (decorated().size() == 0) {
             setOrder.clear();
         } else {
-            for (Iterator<E> it = setOrder.iterator(); it.hasNext();) {
+            for (final Iterator<E> it = setOrder.iterator(); it.hasNext();) {
                 if (!decorated().contains(it.next())) {
                     it.remove();
                 }
@@ -320,7 +320,7 @@
     public boolean addAll(final int index, final Collection<? extends E> coll) {
         boolean changed = false;
         // collect all elements to be added for performance reasons
-        final List<E> toAdd = new ArrayList<E>();
+        final List<E> toAdd = new ArrayList<>();
         for (final E e : coll) {
             if (contains(e)) {
                 continue;
@@ -396,10 +396,12 @@
             last = null;
         }
 
+        @Override
         public boolean hasPrevious() {
             return ((ListIterator<E>) getIterator()).hasPrevious();
         }
 
+        @Override
         public E previous() {
             last = ((ListIterator<E>) getIterator()).previous();
             return last;
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/set/MapBackedSet.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/set/MapBackedSet.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/set/MapBackedSet.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/set/MapBackedSet.java	2018-07-08 00:18:18.000000000 +0000
@@ -32,8 +32,9 @@
  * Most map implementation can be used to create a set by passing in dummy values.
  * Exceptions include <code>BidiMap</code> implementations, as they require unique values.
  *
+ * @param <E> the type of the elements in this set
+ * @param <V> the dummy value type in this map
  * @since 3.1
- * @version $Id: MapBackedSet.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public final class MapBackedSet<E, V> implements Set<E>, Serializable {
 
@@ -72,7 +73,7 @@
      * @since 4.0
      */
     public static <E, V> MapBackedSet<E, V> mapBackedSet(final Map<E, ? super V> map, final V dummyValue) {
-        return new MapBackedSet<E, V>(map, dummyValue);
+        return new MapBackedSet<>(map, dummyValue);
     }
 
     //-----------------------------------------------------------------------
@@ -93,32 +94,39 @@
     }
 
     //-----------------------------------------------------------------------
+    @Override
     public int size() {
         return map.size();
     }
 
+    @Override
     public boolean isEmpty() {
         return map.isEmpty();
     }
 
+    @Override
     public Iterator<E> iterator() {
         return map.keySet().iterator();
     }
 
+    @Override
     public boolean contains(final Object obj) {
         return map.containsKey(obj);
     }
 
+    @Override
     public boolean containsAll(final Collection<?> coll) {
         return map.keySet().containsAll(coll);
     }
 
+    @Override
     public boolean add(final E obj) {
         final int size = map.size();
         map.put(obj, dummyValue);
         return map.size() != size;
     }
 
+    @Override
     public boolean addAll(final Collection<? extends E> coll) {
         final int size = map.size();
         for (final E e : coll) {
@@ -127,28 +135,34 @@
         return map.size() != size;
     }
 
+    @Override
     public boolean remove(final Object obj) {
         final int size = map.size();
         map.remove(obj);
         return map.size() != size;
     }
 
+    @Override
     public boolean removeAll(final Collection<?> coll) {
         return map.keySet().removeAll(coll);
     }
 
+    @Override
     public boolean retainAll(final Collection<?> coll) {
         return map.keySet().retainAll(coll);
     }
 
+    @Override
     public void clear() {
         map.clear();
     }
 
+    @Override
     public Object[] toArray() {
         return map.keySet().toArray();
     }
 
+    @Override
     public <T> T[] toArray(final T[] array) {
         return map.keySet().toArray(array);
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/set/package-info.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/set/package-info.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/set/package-info.java	2015-05-31 18:35:18.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/set/package-info.java	2018-07-08 00:18:18.000000000 +0000
@@ -36,6 +36,5 @@
  *   <li>MapBackedSet - a set formed by decorating a Map
  * </ul>
  *
- * @version $Id: package-info.java 1682768 2015-05-31 18:35:18Z tn $
  */
 package org.apache.commons.collections4.set;
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/set/PredicatedNavigableSet.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/set/PredicatedNavigableSet.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/set/PredicatedNavigableSet.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/set/PredicatedNavigableSet.java	2018-07-08 00:18:18.000000000 +0000
@@ -36,8 +36,8 @@
  *                                              NotNullPredicate.notNullPredicate());
  * </pre>
  *
+ * @param <E> the type of the elements in this set
  * @since 4.1
- * @version $Id: PredicatedNavigableSet.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class PredicatedNavigableSet<E> extends PredicatedSortedSet<E> implements NavigableSet<E> {
 
@@ -60,7 +60,7 @@
      */
     public static <E> PredicatedNavigableSet<E> predicatedNavigableSet(final NavigableSet<E> set,
                                                                        final Predicate<? super E> predicate) {
-        return new PredicatedNavigableSet<E>(set, predicate);
+        return new PredicatedNavigableSet<>(set, predicate);
     }
 
     //-----------------------------------------------------------------------
@@ -92,22 +92,22 @@
     //-----------------------------------------------------------------------
 
     @Override
-    public E lower(E e) {
+    public E lower(final E e) {
         return decorated().lower(e);
     }
 
     @Override
-    public E floor(E e) {
+    public E floor(final E e) {
         return decorated().floor(e);
     }
 
     @Override
-    public E ceiling(E e) {
+    public E ceiling(final E e) {
         return decorated().ceiling(e);
     }
 
     @Override
-    public E higher(E e) {
+    public E higher(final E e) {
         return decorated().higher(e);
     }
 
@@ -132,19 +132,20 @@
     }
 
     @Override
-    public NavigableSet<E> subSet(E fromElement, boolean fromInclusive, E toElement, boolean toInclusive) {
+    public NavigableSet<E> subSet(final E fromElement, final boolean fromInclusive, final E toElement,
+            final boolean toInclusive) {
         final NavigableSet<E> sub = decorated().subSet(fromElement, fromInclusive, toElement, toInclusive);
         return predicatedNavigableSet(sub, predicate);
     }
 
     @Override
-    public NavigableSet<E> headSet(E toElement, boolean inclusive) {
+    public NavigableSet<E> headSet(final E toElement, final boolean inclusive) {
         final NavigableSet<E> head = decorated().headSet(toElement, inclusive);
         return predicatedNavigableSet(head, predicate);
     }
 
     @Override
-    public NavigableSet<E> tailSet(E fromElement, boolean inclusive) {
+    public NavigableSet<E> tailSet(final E fromElement, final boolean inclusive) {
         final NavigableSet<E> tail = decorated().tailSet(fromElement, inclusive);
         return predicatedNavigableSet(tail, predicate);
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/set/PredicatedSet.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/set/PredicatedSet.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/set/PredicatedSet.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/set/PredicatedSet.java	2018-07-08 00:18:18.000000000 +0000
@@ -34,8 +34,8 @@
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  *
+ * @param <E> the type of the elements in this set
  * @since 3.0
- * @version $Id: PredicatedSet.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class PredicatedSet<E> extends PredicatedCollection<E> implements Set<E> {
 
@@ -57,7 +57,7 @@
      * @since 4.0
      */
     public static <E> PredicatedSet<E> predicatedSet(final Set<E> set, final Predicate<? super E> predicate) {
-        return new PredicatedSet<E>(set, predicate);
+        return new PredicatedSet<>(set, predicate);
     }
 
     //-----------------------------------------------------------------------
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/set/PredicatedSortedSet.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/set/PredicatedSortedSet.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/set/PredicatedSortedSet.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/set/PredicatedSortedSet.java	2018-07-08 00:18:18.000000000 +0000
@@ -38,8 +38,8 @@
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  *
+ * @param <E> the type of the elements in this set
  * @since 3.0
- * @version $Id: PredicatedSortedSet.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class PredicatedSortedSet<E> extends PredicatedSet<E> implements SortedSet<E> {
 
@@ -62,7 +62,7 @@
      */
     public static <E> PredicatedSortedSet<E> predicatedSortedSet(final SortedSet<E> set,
                                                                  final Predicate<? super E> predicate) {
-        return new PredicatedSortedSet<E>(set, predicate);
+        return new PredicatedSortedSet<>(set, predicate);
     }
 
     //-----------------------------------------------------------------------
@@ -92,31 +92,37 @@
     }
 
     //-----------------------------------------------------------------------
+    @Override
     public Comparator<? super E> comparator() {
         return decorated().comparator();
     }
 
+    @Override
     public E first() {
         return decorated().first();
     }
 
+    @Override
     public E last() {
         return decorated().last();
     }
 
+    @Override
     public SortedSet<E> subSet(final E fromElement, final E toElement) {
         final SortedSet<E> sub = decorated().subSet(fromElement, toElement);
-        return new PredicatedSortedSet<E>(sub, predicate);
+        return new PredicatedSortedSet<>(sub, predicate);
     }
 
+    @Override
     public SortedSet<E> headSet(final E toElement) {
         final SortedSet<E> head = decorated().headSet(toElement);
-        return new PredicatedSortedSet<E>(head, predicate);
+        return new PredicatedSortedSet<>(head, predicate);
     }
 
+    @Override
     public SortedSet<E> tailSet(final E fromElement) {
         final SortedSet<E> tail = decorated().tailSet(fromElement);
-        return new PredicatedSortedSet<E>(tail, predicate);
+        return new PredicatedSortedSet<>(tail, predicate);
     }
 
 }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/set/TransformedNavigableSet.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/set/TransformedNavigableSet.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/set/TransformedNavigableSet.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/set/TransformedNavigableSet.java	2018-07-08 00:18:18.000000000 +0000
@@ -29,8 +29,8 @@
  * For example, if the transformation converts Strings to Integers, you must
  * use the Integer form to remove objects.
  *
+ * @param <E> the type of the elements in this set
  * @since 4.1
- * @version $Id: TransformedNavigableSet.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class TransformedNavigableSet<E> extends TransformedSortedSet<E> implements NavigableSet<E> {
 
@@ -52,7 +52,7 @@
      */
     public static <E> TransformedNavigableSet<E> transformingNavigableSet(final NavigableSet<E> set,
             final Transformer<? super E, ? extends E> transformer) {
-        return new TransformedNavigableSet<E>(set, transformer);
+        return new TransformedNavigableSet<>(set, transformer);
     }
 
     /**
@@ -72,7 +72,7 @@
     public static <E> TransformedNavigableSet<E> transformedNavigableSet(final NavigableSet<E> set,
             final Transformer<? super E, ? extends E> transformer) {
 
-        final TransformedNavigableSet<E> decorated = new TransformedNavigableSet<E>(set, transformer);
+        final TransformedNavigableSet<E> decorated = new TransformedNavigableSet<>(set, transformer);
         if (set.size() > 0) {
             @SuppressWarnings("unchecked") // set is type E
             final E[] values = (E[]) set.toArray(); // NOPMD - false positive for generics
@@ -113,22 +113,22 @@
     //-----------------------------------------------------------------------
 
     @Override
-    public E lower(E e) {
+    public E lower(final E e) {
         return decorated().lower(e);
     }
 
     @Override
-    public E floor(E e) {
+    public E floor(final E e) {
         return decorated().floor(e);
     }
 
     @Override
-    public E ceiling(E e) {
+    public E ceiling(final E e) {
         return decorated().ceiling(e);
     }
 
     @Override
-    public E higher(E e) {
+    public E higher(final E e) {
         return decorated().higher(e);
     }
 
@@ -153,19 +153,20 @@
     }
 
     @Override
-    public NavigableSet<E> subSet(E fromElement, boolean fromInclusive, E toElement, boolean toInclusive) {
+    public NavigableSet<E> subSet(final E fromElement, final boolean fromInclusive, final E toElement,
+            final boolean toInclusive) {
         final NavigableSet<E> sub = decorated().subSet(fromElement, fromInclusive, toElement, toInclusive);
         return transformingNavigableSet(sub, transformer);
     }
 
     @Override
-    public NavigableSet<E> headSet(E toElement, boolean inclusive) {
+    public NavigableSet<E> headSet(final E toElement, final boolean inclusive) {
         final NavigableSet<E> head = decorated().headSet(toElement, inclusive);
         return transformingNavigableSet(head, transformer);
     }
 
     @Override
-    public NavigableSet<E> tailSet(E fromElement, boolean inclusive) {
+    public NavigableSet<E> tailSet(final E fromElement, final boolean inclusive) {
         final NavigableSet<E> tail = decorated().tailSet(fromElement, inclusive);
         return transformingNavigableSet(tail, transformer);
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/set/TransformedSet.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/set/TransformedSet.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/set/TransformedSet.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/set/TransformedSet.java	2018-07-08 00:18:18.000000000 +0000
@@ -31,8 +31,8 @@
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  *
+ * @param <E> the type of the elements in this set
  * @since 3.0
- * @version $Id: TransformedSet.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class TransformedSet<E> extends TransformedCollection<E> implements Set<E> {
 
@@ -55,7 +55,7 @@
      */
     public static <E> TransformedSet<E> transformingSet(final Set<E> set,
             final Transformer<? super E, ? extends E> transformer) {
-        return new TransformedSet<E>(set, transformer);
+        return new TransformedSet<>(set, transformer);
     }
 
     /**
@@ -74,7 +74,7 @@
      * @since 4.0
      */
     public static <E> Set<E> transformedSet(final Set<E> set, final Transformer<? super E, ? extends E> transformer) {
-        final TransformedSet<E> decorated = new TransformedSet<E>(set, transformer);
+        final TransformedSet<E> decorated = new TransformedSet<>(set, transformer);
         if (set.size() > 0) {
             @SuppressWarnings("unchecked") // set is type E
             final E[] values = (E[]) set.toArray(); // NOPMD - false positive for generics
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/set/TransformedSortedSet.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/set/TransformedSortedSet.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/set/TransformedSortedSet.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/set/TransformedSortedSet.java	2018-07-08 00:18:18.000000000 +0000
@@ -31,8 +31,8 @@
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  *
+ * @param <E> the type of the elements in this set
  * @since 3.0
- * @version $Id: TransformedSortedSet.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class TransformedSortedSet<E> extends TransformedSet<E> implements SortedSet<E> {
 
@@ -55,7 +55,7 @@
      */
     public static <E> TransformedSortedSet<E> transformingSortedSet(final SortedSet<E> set,
             final Transformer<? super E, ? extends E> transformer) {
-        return new TransformedSortedSet<E>(set, transformer);
+        return new TransformedSortedSet<>(set, transformer);
     }
 
     /**
@@ -76,7 +76,7 @@
     public static <E> TransformedSortedSet<E> transformedSortedSet(final SortedSet<E> set,
             final Transformer<? super E, ? extends E> transformer) {
 
-        final TransformedSortedSet<E> decorated = new TransformedSortedSet<E>(set, transformer);
+        final TransformedSortedSet<E> decorated = new TransformedSortedSet<>(set, transformer);
         if (set.size() > 0) {
             @SuppressWarnings("unchecked") // set is type E
             final E[] values = (E[]) set.toArray(); // NOPMD - false positive for generics
@@ -113,32 +113,38 @@
     }
 
     //-----------------------------------------------------------------------
+    @Override
     public E first() {
         return getSortedSet().first();
     }
 
+    @Override
     public E last() {
         return getSortedSet().last();
     }
 
+    @Override
     public Comparator<? super E> comparator() {
         return getSortedSet().comparator();
     }
 
     //-----------------------------------------------------------------------
+    @Override
     public SortedSet<E> subSet(final E fromElement, final E toElement) {
         final SortedSet<E> set = getSortedSet().subSet(fromElement, toElement);
-        return new TransformedSortedSet<E>(set, transformer);
+        return new TransformedSortedSet<>(set, transformer);
     }
 
+    @Override
     public SortedSet<E> headSet(final E toElement) {
         final SortedSet<E> set = getSortedSet().headSet(toElement);
-        return new TransformedSortedSet<E>(set, transformer);
+        return new TransformedSortedSet<>(set, transformer);
     }
 
+    @Override
     public SortedSet<E> tailSet(final E fromElement) {
         final SortedSet<E> set = getSortedSet().tailSet(fromElement);
-        return new TransformedSortedSet<E>(set, transformer);
+        return new TransformedSortedSet<>(set, transformer);
     }
 
 }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/set/UnmodifiableNavigableSet.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/set/UnmodifiableNavigableSet.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/set/UnmodifiableNavigableSet.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/set/UnmodifiableNavigableSet.java	2018-07-08 00:18:18.000000000 +0000
@@ -32,8 +32,8 @@
  * <p>
  * Attempts to modify it will result in an UnsupportedOperationException.
  *
+ * @param <E> the type of the elements in this set
  * @since 4.1
- * @version $Id: UnmodifiableNavigableSet.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public final class UnmodifiableNavigableSet<E>
         extends AbstractNavigableSetDecorator<E>
@@ -54,7 +54,7 @@
         if (set instanceof Unmodifiable) {
             return set;
         }
-        return new UnmodifiableNavigableSet<E>(set);
+        return new UnmodifiableNavigableSet<>(set);
     }
 
     //-----------------------------------------------------------------------
@@ -137,19 +137,20 @@
     }
 
     @Override
-    public NavigableSet<E> subSet(E fromElement, boolean fromInclusive, E toElement, boolean toInclusive) {
+    public NavigableSet<E> subSet(final E fromElement, final boolean fromInclusive, final E toElement,
+            final boolean toInclusive) {
         final NavigableSet<E> sub = decorated().subSet(fromElement, fromInclusive, toElement, toInclusive);
         return unmodifiableNavigableSet(sub);
     }
 
     @Override
-    public NavigableSet<E> headSet(E toElement, boolean inclusive) {
+    public NavigableSet<E> headSet(final E toElement, final boolean inclusive) {
         final NavigableSet<E> head = decorated().headSet(toElement, inclusive);
         return unmodifiableNavigableSet(head);
     }
 
     @Override
-    public NavigableSet<E> tailSet(E fromElement, boolean inclusive) {
+    public NavigableSet<E> tailSet(final E fromElement, final boolean inclusive) {
         final NavigableSet<E> tail = decorated().tailSet(fromElement, inclusive);
         return unmodifiableNavigableSet(tail);
     }
@@ -159,7 +160,7 @@
      * Write the collection out using a custom routine.
      *
      * @param out  the output stream
-     * @throws IOException
+     * @throws IOException if an error occurs while writing to the stream
      */
     private void writeObject(final ObjectOutputStream out) throws IOException {
         out.defaultWriteObject();
@@ -170,8 +171,8 @@
      * Read the collection in using a custom routine.
      *
      * @param in  the input stream
-     * @throws IOException
-     * @throws ClassNotFoundException
+     * @throws IOException if an error occurs while reading from the stream
+     * @throws ClassNotFoundException if an object read from the stream can not be loaded
      */
     @SuppressWarnings("unchecked") // (1) should only fail if input stream is incorrect
     private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/set/UnmodifiableSet.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/set/UnmodifiableSet.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/set/UnmodifiableSet.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/set/UnmodifiableSet.java	2018-07-08 00:18:18.000000000 +0000
@@ -30,8 +30,8 @@
  * <p>
  * Attempts to modify it will result in an UnsupportedOperationException.
  *
+ * @param <E> the type of the elements in this set
  * @since 3.0
- * @version $Id: UnmodifiableSet.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public final class UnmodifiableSet<E>
         extends AbstractSerializableSetDecorator<E>
@@ -55,7 +55,7 @@
             final Set<E> tmpSet = (Set<E>) set;
             return tmpSet;
         }
-        return new UnmodifiableSet<E>(set);
+        return new UnmodifiableSet<>(set);
     }
 
     //-----------------------------------------------------------------------
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/set/UnmodifiableSortedSet.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/set/UnmodifiableSortedSet.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/set/UnmodifiableSortedSet.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/set/UnmodifiableSortedSet.java	2018-07-08 00:18:18.000000000 +0000
@@ -33,8 +33,8 @@
  * <p>
  * Attempts to modify it will result in an UnsupportedOperationException.
  *
+ * @param <E> the type of the elements in this set
  * @since 3.0
- * @version $Id: UnmodifiableSortedSet.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public final class UnmodifiableSortedSet<E>
         extends AbstractSortedSetDecorator<E>
@@ -56,7 +56,7 @@
         if (set instanceof Unmodifiable) {
             return set;
         }
-        return new UnmodifiableSortedSet<E>(set);
+        return new UnmodifiableSortedSet<>(set);
     }
 
     //-----------------------------------------------------------------------
@@ -130,7 +130,7 @@
      * Write the collection out using a custom routine.
      *
      * @param out  the output stream
-     * @throws IOException
+     * @throws IOException if an error occurs while writing to the stream
      */
     private void writeObject(final ObjectOutputStream out) throws IOException {
         out.defaultWriteObject();
@@ -141,8 +141,8 @@
      * Read the collection in using a custom routine.
      *
      * @param in  the input stream
-     * @throws IOException
-     * @throws ClassNotFoundException
+     * @throws IOException if an error occurs while reading from the stream
+     * @throws ClassNotFoundException if an object read from the stream can not be loaded
      */
     @SuppressWarnings("unchecked") // (1) should only fail if input stream is incorrect
     private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/SetUtils.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/SetUtils.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/SetUtils.java	2015-06-22 21:51:07.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/SetUtils.java	2018-07-08 00:18:18.000000000 +0000
@@ -43,7 +43,6 @@
  * {@link Set} and {@link SortedSet} instances.
  *
  * @since 2.1
- * @version $Id: SetUtils.java 1686950 2015-06-22 21:51:07Z tn $
  */
 public class SetUtils {
 
@@ -62,7 +61,7 @@
      */
     @SuppressWarnings("rawtypes")
     public static final SortedSet EMPTY_SORTED_SET =
-            UnmodifiableSortedSet.unmodifiableSortedSet(new TreeSet<Object>());
+            UnmodifiableSortedSet.unmodifiableSortedSet(new TreeSet<>());
 
     /**
      * Get a typed empty unmodifiable sorted set.
@@ -163,10 +162,10 @@
      * Returns a new hash set that matches elements based on <code>==</code> not
      * <code>equals()</code>.
      * <p>
-     * <strong>This set will violate the detail of various Set contracts.</note>
+     * <strong>This set will violate the detail of various Set contracts.</strong>
      * As a general rule, don't compare this set to other sets. In particular, you can't
      * use decorators like {@link ListOrderedSet} on it, which silently assume that these
-     * contracts are fulfilled.</strong>
+     * contracts are fulfilled.
      * <p>
      * <strong>Note that the returned set is not synchronized and is not thread-safe.</strong>
      * If you wish to use this set from multiple threads concurrently, you must use
@@ -447,7 +446,7 @@
 
         return new SetView<E>() {
             @Override
-            public boolean contains(Object o) {
+            public boolean contains(final Object o) {
                 return a.contains(o) || b.contains(o);
             }
 
@@ -489,14 +488,14 @@
 
         final Predicate<E> notContainedInB = new Predicate<E>() {
             @Override
-            public boolean evaluate(E object) {
+            public boolean evaluate(final E object) {
                 return !b.contains(object);
             }
         };
 
         return new SetView<E>() {
             @Override
-            public boolean contains(Object o) {
+            public boolean contains(final Object o) {
                 return a.contains(o) && !b.contains(o);
             }
 
@@ -527,14 +526,14 @@
 
         final Predicate<E> containedInB = new Predicate<E>() {
             @Override
-            public boolean evaluate(E object) {
+            public boolean evaluate(final E object) {
                 return b.contains(object);
             }
         };
 
         return new SetView<E>() {
             @Override
-            public boolean contains(Object o) {
+            public boolean contains(final Object o) {
                 return a.contains(o) && b.contains(o);
             }
 
@@ -571,7 +570,7 @@
 
         return new SetView<E>() {
             @Override
-            public boolean contains(Object o) {
+            public boolean contains(final Object o) {
                 return a.contains(o) ^ b.contains(o);
             }
 
@@ -637,7 +636,7 @@
          * @return a new set containing all elements of this view
          */
         public Set<E> toSet() {
-            final Set<E> set = new HashSet<E>(size());
+            final Set<E> set = new HashSet<>(size());
             copyInto(set);
             return set;
         }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/SetValuedMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/SetValuedMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/SetValuedMap.java	2015-06-13 18:27:11.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/SetValuedMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -27,8 +27,9 @@
  *   <li>Getting a value will return a {@link Set}, holding all the values put to that key.</li>
  * </ul>
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  * @since 4.1
- * @version $Id: SetValuedMap.java 1685299 2015-06-13 18:27:11Z tn $
  */
 public interface SetValuedMap<K, V> extends MultiValuedMap<K, V> {
 
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/SortedBag.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/SortedBag.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/SortedBag.java	2013-11-19 00:48:12.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/SortedBag.java	2018-07-08 00:18:18.000000000 +0000
@@ -22,9 +22,8 @@
  * Defines a type of <code>Bag</code> that maintains a sorted order among
  * its unique representative members.
  *
- * @param <E> the type to iterate over
+ * @param <E> the type of elements in this bag
  * @since 2.0
- * @version $Id: SortedBag.java 1543264 2013-11-19 00:48:12Z ggregory $
  */
 public interface SortedBag<E> extends Bag<E> {
 
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/SortedBidiMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/SortedBidiMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/SortedBidiMap.java	2013-11-19 00:45:24.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/SortedBidiMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -29,7 +29,6 @@
  * @param <K> the type of the keys in the map
  * @param <V> the type of the values in the map
  * @since 3.0
- * @version $Id: SortedBidiMap.java 1543255 2013-11-19 00:45:24Z ggregory $
  */
 public interface SortedBidiMap<K, V> extends OrderedBidiMap<K, V>, SortedMap<K, V> {
 
@@ -48,11 +47,12 @@
      *
      * @return an inverted bidirectional map
      */
+    @Override
     SortedBidiMap<V, K> inverseBidiMap();
 
     /**
      * Get the comparator used for the values in the value-to-key map aspect.
-     * @return Comparator<? super V>
+     * @return Comparator&lt;? super V&gt;
      */
     Comparator<? super V> valueComparator();
 }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/splitmap/AbstractIterableGetMapDecorator.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/splitmap/AbstractIterableGetMapDecorator.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/splitmap/AbstractIterableGetMapDecorator.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/splitmap/AbstractIterableGetMapDecorator.java	2018-07-08 00:18:18.000000000 +0000
@@ -25,11 +25,12 @@
 import org.apache.commons.collections4.map.EntrySetToMapIteratorAdapter;
 
 /**
- * {@link IterableGet} that uses a {@link Map}<K, V> for the
- * {@link org.apache.commons.collections4.Get Get}<K, V> implementation.
+ * {@link IterableGet} that uses a {@link Map}&lt;K, V&gt; for the
+ * {@link org.apache.commons.collections4.Get Get}&lt;K, V&gt; implementation.
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  * @since 4.0
- * @version $Id: AbstractIterableGetMapDecorator.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class AbstractIterableGetMapDecorator<K, V> implements IterableGet<K, V> {
 
@@ -64,48 +65,58 @@
         return map;
     }
 
+    @Override
     public boolean containsKey(final Object key) {
         return decorated().containsKey(key);
     }
 
+    @Override
     public boolean containsValue(final Object value) {
         return decorated().containsValue(value);
     }
 
+    @Override
     public Set<Map.Entry<K, V>> entrySet() {
         return decorated().entrySet();
     }
 
+    @Override
     public V get(final Object key) {
         return decorated().get(key);
     }
 
+    @Override
     public V remove(final Object key) {
         return decorated().remove(key);
     }
 
+    @Override
     public boolean isEmpty() {
         return decorated().isEmpty();
     }
 
+    @Override
     public Set<K> keySet() {
         return decorated().keySet();
     }
 
+    @Override
     public int size() {
         return decorated().size();
     }
 
+    @Override
     public Collection<V> values() {
         return decorated().values();
     }
 
     /**
      * Get a MapIterator over this Get.
-     * @return MapIterator<K, V>
+     * @return MapIterator&lt;K, V&gt;
      */
+    @Override
     public MapIterator<K, V> mapIterator() {
-        return new EntrySetToMapIteratorAdapter<K, V>(entrySet());
+        return new EntrySetToMapIteratorAdapter<>(entrySet());
     }
 
     @Override
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/splitmap/package-info.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/splitmap/package-info.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/splitmap/package-info.java	2013-04-17 17:37:03.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/splitmap/package-info.java	2018-07-08 00:18:18.000000000 +0000
@@ -34,6 +34,5 @@
  *   <li>Transformed - transforms each element added
  * </ul>
  *
- * @version $Id: package-info.java 1469004 2013-04-17 17:37:03Z tn $
  */
 package org.apache.commons.collections4.splitmap;
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/splitmap/TransformedSplitMap.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/splitmap/TransformedSplitMap.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/splitmap/TransformedSplitMap.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/splitmap/TransformedSplitMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -52,8 +52,11 @@
  * but is intended to be worked with either directly or by {@link Put} and
  * {@link org.apache.commons.collections4.Get Get} generalizations.
  *
+ * @param <J> the type of the keys to put in this map
+ * @param <K> the type of the keys to get in this map
+ * @param <U> the type of the values to put in this map
+ * @param <V> the type of the values to get in this map
  * @since 4.0
- * @version $Id: TransformedSplitMap.java 1686855 2015-06-22 13:00:27Z tn $
  *
  * @see org.apache.commons.collections4.SplitMapUtils#readableMap(org.apache.commons.collections4.Get)
  * @see org.apache.commons.collections4.SplitMapUtils#writableMap(Put)
@@ -88,7 +91,7 @@
     public static <J, K, U, V> TransformedSplitMap<J, K, U, V> transformingMap(final Map<K, V> map,
             final Transformer<? super J, ? extends K> keyTransformer,
             final Transformer<? super U, ? extends V> valueTransformer) {
-        return new TransformedSplitMap<J, K, U, V>(map, keyTransformer, valueTransformer);
+        return new TransformedSplitMap<>(map, keyTransformer, valueTransformer);
     }
 
     //-----------------------------------------------------------------------
@@ -121,7 +124,7 @@
      * Write the map out using a custom routine.
      *
      * @param out the output stream
-     * @throws IOException
+     * @throws IOException if an error occurs while writing to the stream
      */
     private void writeObject(final ObjectOutputStream out) throws IOException {
         out.defaultWriteObject();
@@ -132,8 +135,8 @@
      * Read the map in using a custom routine.
      *
      * @param in the input stream
-     * @throws IOException
-     * @throws ClassNotFoundException
+     * @throws IOException if an error occurs while reading from the stream
+     * @throws ClassNotFoundException if an object read from the stream can not be loaded
      * @since 3.1
      */
     @SuppressWarnings("unchecked") // (1) should only fail if input stream is incorrect
@@ -180,7 +183,7 @@
         if (map.isEmpty()) {
             return (Map<K, V>) map;
         }
-        final Map<K, V> result = new LinkedMap<K, V>(map.size());
+        final Map<K, V> result = new LinkedMap<>(map.size());
 
         for (final Map.Entry<? extends J, ? extends U> entry : map.entrySet()) {
             result.put(transformKey(entry.getKey()), transformValue(entry.getValue()));
@@ -199,14 +202,17 @@
     }
 
     //-----------------------------------------------------------------------
+    @Override
     public V put(final J key, final U value) {
         return decorated().put(transformKey(key), transformValue(value));
     }
 
+    @Override
     public void putAll(final Map<? extends J, ? extends U> mapToCopy) {
         decorated().putAll(transformMap(mapToCopy));
     }
 
+    @Override
     public void clear() {
         decorated().clear();
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/SplitMapUtils.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/SplitMapUtils.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/SplitMapUtils.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/SplitMapUtils.java	2018-07-08 00:18:18.000000000 +0000
@@ -31,7 +31,6 @@
  * and/or {@link Get} but not {@link Map}.
  *
  * @since 4.0
- * @version $Id: SplitMapUtils.java 1686855 2015-06-22 13:00:27Z tn $
  *
  * @see Get
  * @see Put
@@ -52,18 +51,22 @@
             this.get = get;
         }
 
+        @Override
         public void clear() {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public boolean containsKey(final Object key) {
             return get.containsKey(key);
         }
 
+        @Override
         public boolean containsValue(final Object value) {
             return get.containsValue(value);
         }
 
+        @Override
         public Set<Map.Entry<K, V>> entrySet() {
             return UnmodifiableEntrySet.unmodifiableEntrySet(get.entrySet());
         }
@@ -76,6 +79,7 @@
             return arg0 instanceof WrappedGet && ((WrappedGet<?, ?>) arg0).get.equals(this.get);
         }
 
+        @Override
         public V get(final Object key) {
             return get.get(key);
         }
@@ -85,40 +89,48 @@
             return ("WrappedGet".hashCode() << 4) | get.hashCode();
         }
 
+        @Override
         public boolean isEmpty() {
             return get.isEmpty();
         }
 
+        @Override
         public Set<K> keySet() {
             return UnmodifiableSet.unmodifiableSet(get.keySet());
         }
 
+        @Override
         public V put(final K key, final V value) {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public void putAll(final Map<? extends K, ? extends V> t) {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public V remove(final Object key) {
             return get.remove(key);
         }
 
+        @Override
         public int size() {
             return get.size();
         }
 
+        @Override
         public Collection<V> values() {
             return UnmodifiableCollection.unmodifiableCollection(get.values());
         }
 
+        @Override
         public MapIterator<K, V> mapIterator() {
             MapIterator<K, V> it;
             if (get instanceof IterableGet) {
                 it = ((IterableGet<K, V>) get).mapIterator();
             } else {
-                it = new EntrySetToMapIteratorAdapter<K, V>(get.entrySet());
+                it = new EntrySetToMapIteratorAdapter<>(get.entrySet());
             }
             return UnmodifiableMapIterator.unmodifiableMapIterator(it);
         }
@@ -131,18 +143,22 @@
             this.put = put;
         }
 
+        @Override
         public void clear() {
             put.clear();
         }
 
+        @Override
         public boolean containsKey(final Object key) {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public boolean containsValue(final Object value) {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public Set<Map.Entry<K, V>> entrySet() {
             throw new UnsupportedOperationException();
         }
@@ -155,6 +171,7 @@
             return obj instanceof WrappedPut && ((WrappedPut<?, ?>) obj).put.equals(this.put);
         }
 
+        @Override
         public V get(final Object key) {
             throw new UnsupportedOperationException();
         }
@@ -164,31 +181,38 @@
             return ("WrappedPut".hashCode() << 4) | put.hashCode();
         }
 
+        @Override
         public boolean isEmpty() {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public Set<K> keySet() {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         @SuppressWarnings("unchecked")
         public V put(final K key, final V value) {
             return (V) put.put(key, value);
         }
 
+        @Override
         public void putAll(final Map<? extends K, ? extends V> t) {
             put.putAll(t);
         }
 
+        @Override
         public V remove(final Object key) {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public int size() {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public Collection<V> values() {
             throw new UnsupportedOperationException();
         }
@@ -217,7 +241,7 @@
                     ((IterableMap<K, V>) get) :
                     MapUtils.iterableMap((Map<K, V>) get);
         }
-        return new WrappedGet<K, V>(get);
+        return new WrappedGet<>(get);
     }
 
     /**
@@ -241,7 +265,7 @@
         if (put instanceof Map) {
             return (Map<K, V>) put;
         }
-        return new WrappedPut<K, V>(put);
+        return new WrappedPut<>(put);
     }
 
 }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/Transformer.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/Transformer.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/Transformer.java	2013-11-19 00:54:07.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/Transformer.java	2018-07-08 00:18:18.000000000 +0000
@@ -33,7 +33,6 @@
  * @param <O> the output type from the transformer
  *
  * @since 1.0
- * @version $Id: Transformer.java 1543278 2013-11-19 00:54:07Z ggregory $
  */
 public interface Transformer<I, O> {
 
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/TransformerUtils.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/TransformerUtils.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/TransformerUtils.java	2015-11-14 20:38:02.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/TransformerUtils.java	2018-07-08 00:18:18.000000000 +0000
@@ -57,7 +57,7 @@
  * <li>StringValue - returns a <code>java.lang.String</code> representation of the input object
  * </ul>
  * <p>
- * Since v4.1 only transformers which are considered to be unsafe are
+ * Since v4.1 only transformers which are considered to be safe are
  * Serializable. Transformers considered to be unsafe for serialization are:
  * <ul>
  * <li>Invoker
@@ -66,7 +66,6 @@
  * </ul>
  *
  * @since 3.0
- * @version $Id: TransformerUtils.java 1714362 2015-11-14 20:38:02Z tn $
  */
 public class TransformerUtils {
 
@@ -117,10 +116,10 @@
      * Gets a transformer that returns a clone of the input object.
      * The input object will be cloned using one of these techniques (in order):
      * <ul>
-     * <li>public clone method
-     * <li>public copy constructor
-     * <li>serialization clone
-     * <ul>
+     * <li>public clone method</li>
+     * <li>public copy constructor</li>
+     * <li>serialization clone</li>
+     * </ul>
      *
      * @param <T>  the input/output type
      * @return the transformer
@@ -267,7 +266,7 @@
      * @return the transformer
      * @throws NullPointerException if either the predicate or transformer is null
      * @see SwitchTransformer
-     * @deprecated as of 4.1, use {@link #ifTransformer(Predicate, Transformer, Transformer))
+     * @deprecated as of 4.1, use {@link #ifTransformer(Predicate, Transformer, Transformer)}
      */
     @SuppressWarnings("unchecked")
     @Deprecated
@@ -430,12 +429,14 @@
 
     /**
      * Gets a Transformer that invokes a method on the input object.
-     * The method must have no parameters. If the input object is null,
-     * null is returned.
+     * The method must have no parameters. If the input object is {@code null},
+     * {@code null} is returned.
+     *
      * <p>
      * For example, <code>TransformerUtils.invokerTransformer("getName");</code>
-     * will call the <code>getName/code> method on the input object to
+     * will call the <code>getName</code> method on the input object to
      * determine the transformer result.
+     * </p>
      *
      * @param <I>  the input type
      * @param <O>  the output type
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/trie/AbstractBitwiseTrie.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/trie/AbstractBitwiseTrie.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/trie/AbstractBitwiseTrie.java	2013-06-13 21:01:00.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/trie/AbstractBitwiseTrie.java	2018-07-08 00:18:18.000000000 +0000
@@ -27,8 +27,9 @@
  * This class provides some basic {@link Trie} functionality and
  * utility methods for actual bitwise {@link Trie} implementations.
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  * @since 4.0
- * @version $Id: AbstractBitwiseTrie.java 1492866 2013-06-13 21:01:00Z tn $
  */
 public abstract class AbstractBitwiseTrie<K, V> extends AbstractMap<K, V>
         implements Trie<K, V>, Serializable {
@@ -169,14 +170,17 @@
             return setValue(value);
         }
 
+        @Override
         public K getKey() {
             return key;
         }
 
+        @Override
         public V getValue() {
             return value;
         }
 
+        @Override
         public V setValue(final V value) {
             final V previous = this.value;
             this.value = value;
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java	2015-01-01 21:10:46.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java	2018-07-08 00:18:18.000000000 +0000
@@ -39,14 +39,13 @@
  * is related to the {@link Map} interface.
  *
  * @since 4.0
- * @version $Id: AbstractPatriciaTrie.java 1648941 2015-01-01 21:10:46Z tn $
  */
 abstract class AbstractPatriciaTrie<K, V> extends AbstractBitwiseTrie<K, V> {
 
     private static final long serialVersionUID = 5155253417231339498L;
 
-    /** The root node of the {@link Trie}. */
-    private transient TrieEntry<K, V> root = new TrieEntry<K, V>(null, null, -1);
+    /** The root node of the {@link org.apache.commons.collections4.Trie}. */
+    private transient TrieEntry<K, V> root = new TrieEntry<>(null, null, -1);
 
     /**
      * Each of these fields are initialized to contain an instance of the
@@ -57,11 +56,11 @@
     private transient volatile Collection<V> values;
     private transient volatile Set<Map.Entry<K,V>> entrySet;
 
-    /** The current size of the {@link Trie}. */
+    /** The current size of the {@link org.apache.commons.collections4.Trie}. */
     private transient int size = 0;
 
     /**
-     * The number of times this {@link Trie} has been modified.
+     * The number of times this {@link org.apache.commons.collections4.Trie} has been modified.
      * It's used to detect concurrent modifications and fail-fast the {@link Iterator}s.
      */
     protected transient int modCount = 0;
@@ -71,8 +70,8 @@
     }
 
     /**
-     * Constructs a new {@link org.apache.commons.collections4.Trie Trie} using the given
-     * {@link KeyAnalyzer} and initializes the {@link org.apache.commons.collections4.Trie Trie}
+     * Constructs a new {@link org.apache.commons.collections4.Trie org.apache.commons.collections4.Trie Trie}
+     * using the given {@link KeyAnalyzer} and initializes the {@link org.apache.commons.collections4.Trie Trie}
      * with the values from the provided {@link Map}.
      */
     protected AbstractPatriciaTrie(final KeyAnalyzer<? super K> keyAnalyzer,
@@ -158,7 +157,7 @@
         if (!KeyAnalyzer.isOutOfBoundsIndex(bitIndex)) {
             if (KeyAnalyzer.isValidBitIndex(bitIndex)) { // in 99.999...9% the case
                 /* NEW KEY+VALUE TUPLE */
-                final TrieEntry<K, V> t = new TrieEntry<K, V>(key, value, bitIndex);
+                final TrieEntry<K, V> t = new TrieEntry<>(key, value, bitIndex);
                 addEntry(t, lengthInBits);
                 incrementSize();
                 return null;
@@ -178,7 +177,7 @@
                 // This is a very special and rare case.
 
                 /* REPLACE OLD KEY+VALUE */
-                if (found != root) {
+                if (found != root) { // NOPMD
                     incrementModCount();
                     return found.setKeyValue(key, value);
                 }
@@ -261,7 +260,7 @@
     }
 
     /**
-     * Returns the {@link Entry} whose key is closest in a bitwise XOR
+     * Returns the {@link java.util.Map.Entry} whose key is closest in a bitwise XOR
      * metric to the given key. This is NOT lexicographic closeness.
      * For example, given the keys:
      *
@@ -271,17 +270,17 @@
      * <li>L = 1001100
      * </ol>
      *
-     * If the {@link Trie} contained 'H' and 'L', a lookup of 'D' would
+     * If the {@link org.apache.commons.collections4.Trie} contained 'H' and 'L', a lookup of 'D' would
      * return 'L', because the XOR distance between D &amp; L is smaller
      * than the XOR distance between D &amp; H.
      *
      * @param key  the key to use in the search
-     * @return the {@link Entry} whose key is closest in a bitwise XOR metric
+     * @return the {@link java.util.Map.Entry} whose key is closest in a bitwise XOR metric
      *   to the provided key
      */
     public Map.Entry<K, V> select(final K key) {
         final int lengthInBits = lengthInBits(key);
-        final Reference<Map.Entry<K, V>> reference = new Reference<Map.Entry<K,V>>();
+        final Reference<Map.Entry<K, V>> reference = new Reference<>();
         if (!selectR(root.left, -1, key, lengthInBits, reference)) {
             return reference.get();
         }
@@ -300,7 +299,7 @@
      * <li>L = 1001100
      * </ol>
      *
-     * If the {@link Trie} contained 'H' and 'L', a lookup of 'D' would
+     * If the {@link org.apache.commons.collections4.Trie} contained 'H' and 'L', a lookup of 'D' would
      * return 'L', because the XOR distance between D &amp; L is smaller
      * than the XOR distance between D &amp; H.
      *
@@ -327,7 +326,7 @@
      * <li>L = 1001100
      * </ol>
      *
-     * If the {@link Trie} contained 'H' and 'L', a lookup of 'D' would
+     * If the {@link org.apache.commons.collections4.Trie} contained 'H' and 'L', a lookup of 'D' would
      * return 'L', because the XOR distance between D &amp; L is smaller
      * than the XOR distance between D &amp; H.
      *
@@ -771,10 +770,12 @@
 
     //-----------------------------------------------------------------------
 
+    @Override
     public Comparator<? super K> comparator() {
         return getKeyAnalyzer();
     }
 
+    @Override
     public K firstKey() {
         if (size() == 0) {
             throw new NoSuchElementException();
@@ -782,6 +783,7 @@
         return firstEntry().getKey();
     }
 
+    @Override
     public K lastKey() {
         final TrieEntry<K, V> entry = lastEntry();
         if (entry != null) {
@@ -790,6 +792,7 @@
         throw new NoSuchElementException();
     }
 
+    @Override
     public K nextKey(final K key) {
         if (key == null) {
             throw new NullPointerException();
@@ -802,6 +805,7 @@
         return null;
     }
 
+    @Override
     public K previousKey(final K key) {
         if (key == null) {
             throw new NullPointerException();
@@ -814,10 +818,12 @@
         return null;
     }
 
+    @Override
     public OrderedMapIterator<K, V> mapIterator() {
         return new TrieMapIterator();
     }
 
+    @Override
     public SortedMap<K, V> prefixMap(final K key) {
         return getPrefixMapByBits(key, 0, lengthInBits(key));
     }
@@ -858,14 +864,17 @@
         return new PrefixRangeMap(key, offsetInBits, lengthInBits);
     }
 
+    @Override
     public SortedMap<K, V> headMap(final K toKey) {
         return new RangeEntryMap(null, toKey);
     }
 
+    @Override
     public SortedMap<K, V> subMap(final K fromKey, final K toKey) {
         return new RangeEntryMap(fromKey, toKey);
     }
 
+    @Override
     public SortedMap<K, V> tailMap(final K fromKey) {
         return new RangeEntryMap(fromKey, null);
     }
@@ -900,7 +909,7 @@
 
         final int bitIndex = bitIndex(key, found.key);
         if (KeyAnalyzer.isValidBitIndex(bitIndex)) {
-            final TrieEntry<K, V> added = new TrieEntry<K, V>(key, null, bitIndex);
+            final TrieEntry<K, V> added = new TrieEntry<>(key, null, bitIndex);
             addEntry(added, lengthInBits);
             incrementSize(); // must increment because remove will decrement
             final TrieEntry<K, V> ceil = nextEntry(added);
@@ -962,7 +971,7 @@
 
         final int bitIndex = bitIndex(key, found.key);
         if (KeyAnalyzer.isValidBitIndex(bitIndex)) {
-            final TrieEntry<K, V> added = new TrieEntry<K, V>(key, null, bitIndex);
+            final TrieEntry<K, V> added = new TrieEntry<>(key, null, bitIndex);
             addEntry(added, lengthInBits);
             incrementSize(); // must increment because remove will decrement
             final TrieEntry<K, V> ceil = nextEntry(added);
@@ -1017,7 +1026,7 @@
 
         final int bitIndex = bitIndex(key, found.key);
         if (KeyAnalyzer.isValidBitIndex(bitIndex)) {
-            final TrieEntry<K, V> added = new TrieEntry<K, V>(key, null, bitIndex);
+            final TrieEntry<K, V> added = new TrieEntry<>(key, null, bitIndex);
             addEntry(added, lengthInBits);
             incrementSize(); // must increment because remove will decrement
             final TrieEntry<K, V> prior = previousEntry(added);
@@ -1058,7 +1067,7 @@
 
         final int bitIndex = bitIndex(key, found.key);
         if (KeyAnalyzer.isValidBitIndex(bitIndex)) {
-            final TrieEntry<K, V> added = new TrieEntry<K, V>(key, null, bitIndex);
+            final TrieEntry<K, V> added = new TrieEntry<>(key, null, bitIndex);
             addEntry(added, lengthInBits);
             incrementSize(); // must increment because remove will decrement
             final TrieEntry<K, V> floor = previousEntry(added);
@@ -1258,7 +1267,7 @@
     }
 
     /**
-     *  A {@link Trie} is a set of {@link TrieEntry} nodes.
+     *  A {@link org.apache.commons.collections4.Trie} is a set of {@link TrieEntry} nodes.
      */
     protected static class TrieEntry<K,V> extends BasicEntry<K, V> {
 
@@ -1422,6 +1431,7 @@
          * An {@link Iterator} that returns {@link Entry} Objects.
          */
         private class EntryIterator extends TrieIterator<Map.Entry<K,V>> {
+            @Override
             public Map.Entry<K,V> next() {
                 return nextEntry();
             }
@@ -1464,6 +1474,7 @@
          * An {@link Iterator} that returns Key Objects.
          */
         private class KeyIterator extends TrieIterator<K> {
+            @Override
             public K next() {
                 return nextEntry().getKey();
             }
@@ -1511,6 +1522,7 @@
          * An {@link Iterator} that returns Value Objects.
          */
         private class ValueIterator extends TrieIterator<V> {
+            @Override
             public V next() {
                 return nextEntry().getValue();
             }
@@ -1567,10 +1579,12 @@
             return AbstractPatriciaTrie.this.nextEntry(prior);
         }
 
+        @Override
         public boolean hasNext() {
             return next != null;
         }
 
+        @Override
         public void remove() {
             if (current == null) {
                 throw new IllegalStateException();
@@ -1595,10 +1609,12 @@
 
         protected TrieEntry<K, V> previous; // the previous node to return
 
+        @Override
         public K next() {
             return nextEntry().getKey();
         }
 
+        @Override
         public K getKey() {
             if (current == null) {
                 throw new IllegalStateException();
@@ -1606,6 +1622,7 @@
             return current.getKey();
         }
 
+        @Override
         public V getValue() {
             if (current == null) {
                 throw new IllegalStateException();
@@ -1613,6 +1630,7 @@
             return current.getValue();
         }
 
+        @Override
         public V setValue(final V value) {
             if (current == null) {
                 throw new IllegalStateException();
@@ -1620,10 +1638,12 @@
             return current.setValue(value);
         }
 
+        @Override
         public boolean hasPrevious() {
             return previous != null;
         }
 
+        @Override
         public K previous() {
             return previousEntry().getKey();
         }
@@ -1687,6 +1707,7 @@
          */
         protected abstract boolean isToInclusive();
 
+        @Override
         public Comparator<? super K> comparator() {
             return AbstractPatriciaTrie.this.comparator();
         }
@@ -1734,6 +1755,7 @@
             return entrySet;
         }
 
+        @Override
         public SortedMap<K, V> subMap(final K fromKey, final K toKey) {
             if (!inRange2(fromKey)) {
                 throw new IllegalArgumentException("FromKey is out of range: " + fromKey);
@@ -1746,6 +1768,7 @@
             return createRangeMap(fromKey, isFromInclusive(), toKey, isToInclusive());
         }
 
+        @Override
         public SortedMap<K, V> headMap(final K toKey) {
             if (!inRange2(toKey)) {
                 throw new IllegalArgumentException("ToKey is out of range: " + toKey);
@@ -1753,6 +1776,7 @@
             return createRangeMap(getFromKey(), isFromInclusive(), toKey, isToInclusive());
         }
 
+        @Override
         public SortedMap<K, V> tailMap(final K fromKey) {
             if (!inRange2(fromKey)) {
                 throw new IllegalArgumentException("FromKey is out of range: " + fromKey);
@@ -1860,7 +1884,8 @@
            this.toInclusive = toInclusive;
        }
 
-       public K firstKey() {
+       @Override
+    public K firstKey() {
            Map.Entry<K,V> e = null;
            if (fromKey == null) {
                e = firstEntry();
@@ -1879,7 +1904,8 @@
            return first;
        }
 
-       public K lastKey() {
+       @Override
+    public K lastKey() {
            Map.Entry<K,V> e;
            if (toKey == null) {
                e = lastEntry();
@@ -2049,6 +2075,7 @@
                 return next != null && !compare(next.key, excludedKey);
             }
 
+            @Override
             public Map.Entry<K,V> next() {
                 if (next == null || compare(next.key, excludedKey)) {
                     throw new NoSuchElementException();
@@ -2130,6 +2157,7 @@
             return size;
         }
 
+        @Override
         public K firstKey() {
             fixup();
 
@@ -2148,6 +2176,7 @@
             return first;
         }
 
+        @Override
         public K lastKey() {
             fixup();
 
@@ -2228,6 +2257,17 @@
                                                  final K toKey, final boolean toInclusive) {
             return new RangeEntryMap(fromKey, fromInclusive, toKey, toInclusive);
         }
+
+        @Override
+        public void clear() {
+            final Iterator<Map.Entry<K, V>> it = AbstractPatriciaTrie.this.entrySet().iterator();
+            final Set<K> currentKeys = keySet();
+            while (it.hasNext()) {
+                if (currentKeys.contains(it.next().getKey())) {
+                    it.remove();
+                }
+            }
+        }
     }
 
     /**
@@ -2284,10 +2324,12 @@
                 this.entry = entry;
             }
 
+            @Override
             public boolean hasNext() {
                 return hit == 0;
             }
 
+            @Override
             public Map.Entry<K, V> next() {
                 if (hit != 0) {
                     throw new NoSuchElementException();
@@ -2297,6 +2339,7 @@
                 return entry;
             }
 
+            @Override
             public void remove() {
                 if (hit != 1) {
                     throw new IllegalStateException();
@@ -2333,6 +2376,7 @@
                 this.lengthInBits = lengthInBits;
             }
 
+            @Override
             public Map.Entry<K,V> next() {
                 final Map.Entry<K, V> entry = nextEntry();
                 if (lastOne) {
@@ -2382,11 +2426,11 @@
     @SuppressWarnings("unchecked") // This will fail at runtime if the stream is incorrect
     private void readObject(final ObjectInputStream stream) throws IOException, ClassNotFoundException{
         stream.defaultReadObject();
-        root = new TrieEntry<K, V>(null, null, -1);
-        int size = stream.readInt();
+        root = new TrieEntry<>(null, null, -1);
+        final int size = stream.readInt();
         for(int i = 0; i < size; i++){
-            K k = (K) stream.readObject();
-            V v = (V) stream.readObject();
+            final K k = (K) stream.readObject();
+            final V v = (V) stream.readObject();
             put(k, v);
         }
     }
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/trie/analyzer/package-info.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/trie/analyzer/package-info.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/trie/analyzer/package-info.java	2013-06-10 21:46:19.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/trie/analyzer/package-info.java	2018-07-08 00:18:18.000000000 +0000
@@ -17,6 +17,5 @@
 /**
  * This package contains various {@link org.apache.commons.collections4.trie.KeyAnalyzer} implementations.
  *
- * @version $Id: package-info.java 1491615 2013-06-10 21:46:19Z tn $
  */
 package org.apache.commons.collections4.trie.analyzer;
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/trie/analyzer/StringKeyAnalyzer.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/trie/analyzer/StringKeyAnalyzer.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/trie/analyzer/StringKeyAnalyzer.java	2013-11-18 21:22:43.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/trie/analyzer/StringKeyAnalyzer.java	2018-07-08 00:18:18.000000000 +0000
@@ -22,7 +22,6 @@
  * An {@link KeyAnalyzer} for {@link String}s.
  *
  * @since 4.0
- * @version $Id: StringKeyAnalyzer.java 1543168 2013-11-18 21:22:43Z ggregory $
  */
 public class StringKeyAnalyzer extends KeyAnalyzer<String> {
 
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/trie/KeyAnalyzer.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/trie/KeyAnalyzer.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/trie/KeyAnalyzer.java	2013-06-10 22:05:38.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/trie/KeyAnalyzer.java	2018-07-08 00:18:18.000000000 +0000
@@ -29,8 +29,8 @@
  * key (if the key and found key are equal than the return value is
  * {@link #EQUAL_BIT_KEY}).
  *
+ * @param <K> the type of objects that may be compared by this analyzer
  * @since 4.0
- * @version $Id: KeyAnalyzer.java 1491621 2013-06-10 22:05:38Z tn $
  */
 public abstract class KeyAnalyzer<K> implements Comparator<K>, Serializable {
 
@@ -134,6 +134,7 @@
      */
     public abstract boolean isPrefix(K prefix, int offsetInBits, int lengthInBits, K key);
 
+    @Override
     @SuppressWarnings("unchecked")
     public int compare(final K o1, final K o2) {
         if (o1 == null) {
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/trie/package-info.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/trie/package-info.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/trie/package-info.java	2013-06-16 15:56:35.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/trie/package-info.java	2018-07-08 00:18:18.000000000 +0000
@@ -32,6 +32,5 @@
  *   <li>Unmodifiable - ensures the collection cannot be altered
  * </ul>
  *
- * @version $Id: package-info.java 1493523 2013-06-16 15:56:35Z tn $
  */
 package org.apache.commons.collections4.trie;
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/trie/PatriciaTrie.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/trie/PatriciaTrie.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/trie/PatriciaTrie.java	2013-11-20 20:15:35.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/trie/PatriciaTrie.java	2018-07-08 00:18:18.000000000 +0000
@@ -24,10 +24,12 @@
  * Implementation of a PATRICIA Trie (Practical Algorithm to Retrieve Information
  * Coded in Alphanumeric).
  * <p>
- * A PATRICIA {@link Trie} is a compressed {@link Trie}. Instead of storing
- * all data at the edges of the {@link Trie} (and having empty internal nodes),
- * PATRICIA stores data in every node. This allows for very efficient traversal,
- * insert, delete, predecessor, successor, prefix, range, and {@link #select(Object)}
+ * A PATRICIA {@link org.apache.commons.collections4.Trie} is a compressed
+ * {@link org.apache.commons.collections4.Trie}. Instead of storing
+ * all data at the edges of the {@link org.apache.commons.collections4.Trie}
+ * (and having empty internal nodes), PATRICIA stores data in every node.
+ * This allows for very efficient traversal, insert, delete, predecessor,
+ * successor, prefix, range, and {@link #select(Object)}
  * operations. All operations are performed at worst in O(K) time, where K
  * is the number of bits in the largest item in the tree. In practice,
  * operations actually take O(A(K)) time, where A(K) is the average number of
@@ -38,21 +40,23 @@
  * K of them, described above) will perform a single bit comparison against
  * the given key, instead of comparing the entire key to another key.
  * <p>
- * The {@link Trie} can return operations in lexicographical order using the
- * 'prefixMap', 'submap', or 'iterator' methods. The {@link Trie} can also
+ * The {@link org.apache.commons.collections4.Trie} can return operations in
+ * lexicographical order using the 'prefixMap', 'submap', or 'iterator' methods.
+ * The {@link org.apache.commons.collections4.Trie} can also
  * scan for items that are 'bitwise' (using an XOR metric) by the 'select' method.
  * Bitwise closeness is determined by the {@link KeyAnalyzer} returning true or
  * false for a bit being set or not in a given key.
  * <p>
- * This PATRICIA {@link Trie} supports both variable length & fixed length
- * keys. Some methods, such as {@link #prefixMap(Object)} are suited only
- * to variable length keys.
+ * This PATRICIA {@link org.apache.commons.collections4.Trie} supports both variable
+ * length &amp; fixed length keys. Some methods, such as {@link #prefixMap(Object)}
+ * are suited only to variable length keys.
+ *
+ * @param <E> the type of the values in this map
  *
  * @see <a href="http://en.wikipedia.org/wiki/Radix_tree">Radix Tree</a>
  * @see <a href="http://www.csse.monash.edu.au/~lloyd/tildeAlgDS/Tree/PATRICIA">PATRICIA</a>
  * @see <a href="http://www.imperialviolet.org/binary/critbit.pdf">Crit-Bit Tree</a>
  * @since 4.0
- * @version $Id: PatriciaTrie.java 1543928 2013-11-20 20:15:35Z tn $
  */
 public class PatriciaTrie<E> extends AbstractPatriciaTrie<String, E> {
 
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/trie/UnmodifiableTrie.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/trie/UnmodifiableTrie.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/trie/UnmodifiableTrie.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/trie/UnmodifiableTrie.java	2018-07-08 00:18:18.000000000 +0000
@@ -32,8 +32,9 @@
 /**
  * An unmodifiable {@link Trie}.
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  * @since 4.0
- * @version $Id: UnmodifiableTrie.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class UnmodifiableTrie<K, V> implements Trie<K, V>, Serializable, Unmodifiable {
 
@@ -57,7 +58,7 @@
             final Trie<K, V> tmpTrie = (Trie<K, V>) trie;
             return tmpTrie;
         }
-        return new UnmodifiableTrie<K, V>(trie);
+        return new UnmodifiableTrie<>(trie);
     }
 
     //-----------------------------------------------------------------------
@@ -78,93 +79,115 @@
 
     //-----------------------------------------------------------------------
 
+    @Override
     public Set<Entry<K, V>> entrySet() {
         return Collections.unmodifiableSet(delegate.entrySet());
     }
 
+    @Override
     public Set<K> keySet() {
         return Collections.unmodifiableSet(delegate.keySet());
     }
 
+    @Override
     public Collection<V> values() {
         return Collections.unmodifiableCollection(delegate.values());
     }
 
+    @Override
     public void clear() {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean containsKey(final Object key) {
         return delegate.containsKey(key);
     }
 
+    @Override
     public boolean containsValue(final Object value) {
         return delegate.containsValue(value);
     }
 
+    @Override
     public V get(final Object key) {
         return delegate.get(key);
     }
 
+    @Override
     public boolean isEmpty() {
         return delegate.isEmpty();
     }
 
+    @Override
     public V put(final K key, final V value) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void putAll(final Map<? extends K, ? extends V> m) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public V remove(final Object key) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public int size() {
         return delegate.size();
     }
 
+    @Override
     public K firstKey() {
         return delegate.firstKey();
     }
 
+    @Override
     public SortedMap<K, V> headMap(final K toKey) {
         return Collections.unmodifiableSortedMap(delegate.headMap(toKey));
     }
 
+    @Override
     public K lastKey() {
         return delegate.lastKey();
     }
 
+    @Override
     public SortedMap<K, V> subMap(final K fromKey, final K toKey) {
         return Collections.unmodifiableSortedMap(delegate.subMap(fromKey, toKey));
     }
 
+    @Override
     public SortedMap<K, V> tailMap(final K fromKey) {
         return Collections.unmodifiableSortedMap(delegate.tailMap(fromKey));
     }
 
+    @Override
     public SortedMap<K, V> prefixMap(final K key) {
         return Collections.unmodifiableSortedMap(delegate.prefixMap(key));
     }
 
+    @Override
     public Comparator<? super K> comparator() {
         return delegate.comparator();
     }
 
     //-----------------------------------------------------------------------
+    @Override
     public OrderedMapIterator<K, V> mapIterator() {
         final OrderedMapIterator<K, V> it = delegate.mapIterator();
         return UnmodifiableOrderedMapIterator.unmodifiableOrderedMapIterator(it);
     }
 
-    public K nextKey(K key) {
+    @Override
+    public K nextKey(final K key) {
         return delegate.nextKey(key);
     }
 
-    public K previousKey(K key) {
+    @Override
+    public K previousKey(final K key) {
         return delegate.previousKey(key);
     }
 
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/Trie.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/Trie.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/Trie.java	2013-11-19 00:54:31.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/Trie.java	2018-07-08 00:18:18.000000000 +0000
@@ -22,8 +22,9 @@
  * Defines the interface for a prefix tree, an ordered tree data structure. For
  * more information, see <a href="http://en.wikipedia.org/wiki/Trie">Tries</a>.
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  * @since 4.0
- * @version $Id: Trie.java 1543279 2013-11-19 00:54:31Z ggregory $
  */
 public interface Trie<K, V> extends IterableSortedMap<K, V> {
 
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/TrieUtils.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/TrieUtils.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/TrieUtils.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/TrieUtils.java	2018-07-08 00:18:18.000000000 +0000
@@ -22,7 +22,6 @@
  * A collection of {@link Trie} utilities.
  *
  * @since 4.0
- * @version $Id: TrieUtils.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class TrieUtils {
 
diff -Nru libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/Unmodifiable.java libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/Unmodifiable.java
--- libcommons-collections4-java-4.1/src/main/java/org/apache/commons/collections4/Unmodifiable.java	2013-04-30 18:55:24.000000000 +0000
+++ libcommons-collections4-java-4.2/src/main/java/org/apache/commons/collections4/Unmodifiable.java	2018-07-08 00:18:18.000000000 +0000
@@ -31,7 +31,6 @@
  * then the interface won't be there.
  *
  * @since 3.0
- * @version $Id: Unmodifiable.java 1477779 2013-04-30 18:55:24Z tn $
  */
 public interface Unmodifiable {
     // marker interface - no methods to implement
diff -Nru libcommons-collections4-java-4.1/src/site/site.xml libcommons-collections4-java-4.2/src/site/site.xml
--- libcommons-collections4-java-4.1/src/site/site.xml	2015-11-22 00:37:47.000000000 +0000
+++ libcommons-collections4-java-4.2/src/site/site.xml	2018-07-08 00:18:18.000000000 +0000
@@ -29,12 +29,16 @@
             <item name="Security Reports"     href="/security-reports.html"/>
             <item name="Users guide"          href="/userguide.html"/>
             <item name="History"              href="/history.html"/>
-            <item name="Release Notes v4.1"   href="/release_4_1.html"/>
-            <item name="Release Notes v4.0"   href="/release_4_0.html"/>
-            <item name="Release Notes v3.2.2" href="/release_3_2_2.html"/>
-            <item name="Javadoc v4.1"         href="/javadocs/api-release/index.html"/>
-            <item name="Javadoc v4.0"         href="/javadocs/api-4.0/index.html"/>
-            <item name="Javadoc v3.2.2"       href="/javadocs/api-3.2.2/index.html"/>
+            <item name="Release Notes 4.2"    href="/release_4_2.html"/>
+            <item name="Release Notes 4.1"    href="/release_4_1.html"/>
+            <item name="Release Notes 4.0"    href="/release_4_0.html"/>
+            <item name="Release Notes 3.2.2"  href="/release_3_2_2.html"/>
+            <item name="Release Notes 3.2.1"  href="/release_3_2_1.html"/>
+            <item name="Release Notes 3.2"    href="/release_3_2.html"/>
+            <item name="Javadoc 4.2"          href="/javadocs/api-4.2/index.html"/>
+            <item name="Javadoc 4.1"          href="/javadocs/api-4.1/index.html"/>
+            <item name="Javadoc 4.0"          href="/javadocs/api-4.0/index.html"/>
+            <item name="Javadoc 3.2.2"        href="/javadocs/api-3.2.2/index.html"/>
         </menu>
 
         <menu name="Development">
@@ -42,8 +46,8 @@
             <item name="Mailing Lists"        href="/mail-lists.html"/>
             <item name="Issue Tracking"       href="/issue-tracking.html"/>
             <item name="Proposal"             href="/proposal.html"/>
-            <item name="Source Repository"    href="/source-repository.html"/>
-            <item name="Javadoc (SVN latest)" href="apidocs/index.html"/>
+            <item name="Source Repository"    href="/scm.html"/>
+            <item name="Javadoc (latest)"     href="/apidocs/index.html"/>
         </menu>
 
     </body>
diff -Nru libcommons-collections4-java-4.1/src/site/xdoc/building.xml libcommons-collections4-java-4.2/src/site/xdoc/building.xml
--- libcommons-collections4-java-4.1/src/site/xdoc/building.xml	2015-11-21 09:52:05.000000000 +0000
+++ libcommons-collections4-java-4.2/src/site/xdoc/building.xml	2018-07-08 00:18:18.000000000 +0000
@@ -24,15 +24,14 @@
 <!-- ================================================== -->
 <section name="Building Commons Collections">
 <p>
-  Commons Collections uses <a href="http://maven.apache.org">Maven 2</a> as its
-  primary build system, however an <a href="http://ant.apache.org">Ant</a>
-  build is also available.
+  Commons Collections uses <a href="http://maven.apache.org">Maven 3</a> as its
+  primary build system.
 </p>
 </section>
 <!-- ================================================== -->
-<section name="Maven 2 Goals">
+<section name="Maven 3 Goals">
   <p>
-    The following <strong><i>Maven 2</i></strong> commands can be used to build collections:
+    The following <strong><i>Maven 3</i></strong> commands can be used to build collections:
   </p>
   <ul>
     <li><code>mvn clean</code> - clean up</li>
@@ -44,18 +43,5 @@
   </ul>
 </section>
 <!-- ================================================== -->
-<section name="Ant Goals">
-  <p>
-    The following <strong><i>Ant</i></strong> commands can be used to build collections:
-  </p>
-  <ul>
-    <li><code>ant clean</code> - clean up</li>
-    <li><code>ant test</code> - compile and run the unit tests</li>
-    <li><code>ant javadoc</code> - create javadocs</li>
-    <li><code>ant jar</code> - build the jar</li>
-    <li><code>ant dist</code> - Create the source and binary distributions</li>
-  </ul>
-</section>
-<!-- ================================================== -->
 </body>
 </document>
diff -Nru libcommons-collections4-java-4.1/src/site/xdoc/download_collections.xml libcommons-collections4-java-4.2/src/site/xdoc/download_collections.xml
--- libcommons-collections4-java-4.1/src/site/xdoc/download_collections.xml	2015-11-25 21:52:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/site/xdoc/download_collections.xml	2018-07-08 00:18:18.000000000 +0000
@@ -31,10 +31,21 @@
  | 2) Set the following properties in the component's pom:              |
  |    - commons.componentid (required, alphabetic, lower case)          |
  |    - commons.release.version (required)                              |
- |    - commons.binary.suffix (optional)                                |
+ |    - commons.release.name    (required)                              |
+ |    - commons.binary.suffix   (optional)                              |
  |      (defaults to "-bin", set to "" for pre-maven2 releases)         |
+ |    - commons.release.desc    (optional)                              |
+ |    - commons.release.subdir  (optional)                              |
+ |                                                                      |
+ |    - commons.release.2/3.version       (conditional)                 |
+ |    - commons.release.2/3.name          (conditional)                 |
+ |    - commons.release.2/3.binary.suffix (optional)                    |
+ |    - commons.release.2/3.desc          (optional)                    |
+ |    - commons.release.2/3.subdir        (optional)                    |
  |                                                                      |
  | 3) Example Properties                                                |
+ |    (commons.release.name inherited by parent:                        |
+ |     ${project.artifactId}-${commons.release.version}                 |
  |                                                                      |
  |  <properties>                                                        |
  |    <commons.componentid>math</commons.componentid>                   |
@@ -46,17 +57,17 @@
 <document>
   <properties>
     <title>Download Apache Commons Collections</title>
-    <author email="dev@commons.apache.org">Commons Documentation Team</author>
+    <author email="dev@commons.apache.org">Apache Commons Documentation Team</author>
   </properties>
   <body>
     <section name="Download Apache Commons Collections">
     <subsection name="Using a Mirror">
       <p>
         We recommend you use a mirror to download our release
-        builds, but you <strong>must</strong> verify the integrity of
+        builds, but you <strong>must</strong> <a href="http://www.apache.org/info/verification.html">verify the integrity</a> of
         the downloaded files using signatures downloaded from our main
         distribution directories. Recent releases (48 hours) may not yet
-        be available from the mirrors.
+        be available from all the mirrors.
       </p>
 
       <p>
@@ -88,39 +99,74 @@
       </form>
 
       <p>
-        The <a href="http://www.apache.org/dist/commons/KEYS">KEYS</a>
-        link links to the code signing keys used to sign the product.
-        The <code>PGP</code> link downloads the OpenPGP compatible signature from our main site.
-        The <code>MD5</code> link downloads the checksum from the main site.
+        It is essential that you
+        <a href="https://www.apache.org/info/verification.html">verify the integrity</a>
+        of downloaded files, preferably using the <code>PGP</code> signature (<code>*.asc</code> files);
+        failing that using the <code>SHA1</code> hash (<code>*.sha1</code> checksum files).
+      </p>
+      <p>
+        The <a href="https://www.apache.org/dist/commons/KEYS">KEYS</a>
+        file contains the public PGP keys used by Apache Commons developers
+        to sign releases.
       </p>
     </subsection>
     </section>
-    <section name="Apache Commons Collections 4.1 (Java 6.0+)">
+    <section name="Apache Commons Collections 4.2 (Requires Java 7 or later)">
+      <subsection name="Binaries">
+        <table>
+          <tr>
+              <td><a href="[preferred]/commons/collections/binaries/commons-collections4-4.2-bin.tar.gz">commons-collections4-4.2-bin.tar.gz</a></td>
+              <td><a href="https://www.apache.org/dist/commons/collections/binaries/commons-collections4-4.2-bin.tar.gz.sha1">sha1</a></td>
+              <td><a href="https://www.apache.org/dist/commons/collections/binaries/commons-collections4-4.2-bin.tar.gz.asc">pgp</a></td>
+          </tr>
+          <tr>
+              <td><a href="[preferred]/commons/collections/binaries/commons-collections4-4.2-bin.zip">commons-collections4-4.2-bin.zip</a></td>
+              <td><a href="https://www.apache.org/dist/commons/collections/binaries/commons-collections4-4.2-bin.zip.sha1">sha1</a></td>
+              <td><a href="https://www.apache.org/dist/commons/collections/binaries/commons-collections4-4.2-bin.zip.asc">pgp</a></td>
+          </tr>
+        </table>
+      </subsection>
+      <subsection name="Source">
+        <table>
+          <tr>
+              <td><a href="[preferred]/commons/collections/source/commons-collections4-4.2-src.tar.gz">commons-collections4-4.2-src.tar.gz</a></td>
+              <td><a href="https://www.apache.org/dist/commons/collections/source/commons-collections4-4.2-src.tar.gz.sha1">sha1</a></td>
+              <td><a href="https://www.apache.org/dist/commons/collections/source/commons-collections4-4.2-src.tar.gz.asc">pgp</a></td>
+          </tr>
+          <tr>
+              <td><a href="[preferred]/commons/collections/source/commons-collections4-4.2-src.zip">commons-collections4-4.2-src.zip</a></td>
+              <td><a href="https://www.apache.org/dist/commons/collections/source/commons-collections4-4.2-src.zip.sha1">sha1</a></td>
+              <td><a href="https://www.apache.org/dist/commons/collections/source/commons-collections4-4.2-src.zip.asc">pgp</a></td>
+          </tr>
+        </table>
+      </subsection>
+    </section>
+    <section name="Apache Commons Collections 4.1 (Requires Java 6 or later)">
       <subsection name="Binaries">
         <table>
           <tr>
-              <td><a href="[preferred]/commons/collections/binaries/commons-collections4-4.1-bin.tar.gz">commons-collections4-4.1-bin.tar.gz</a></td>
-              <td><a href="http://www.apache.org/dist/commons/collections/binaries/commons-collections4-4.1-bin.tar.gz.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/commons/collections/binaries/commons-collections4-4.1-bin.tar.gz.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/collections/binaries/commons-collections-4.1-bin.tar.gz">commons-collections-4.1-bin.tar.gz</a></td>
+              <td><a href="https://www.apache.org/dist/commons/collections/binaries/commons-collections-4.1-bin.tar.gz.sha1">sha1</a></td>
+              <td><a href="https://www.apache.org/dist/commons/collections/binaries/commons-collections-4.1-bin.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
-              <td><a href="[preferred]/commons/collections/binaries/commons-collections4-4.1-bin.zip">commons-collections4-4.1-bin.zip</a></td>
-              <td><a href="http://www.apache.org/dist/commons/collections/binaries/commons-collections4-4.1-bin.zip.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/commons/collections/binaries/commons-collections4-4.1-bin.zip.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/collections/binaries/commons-collections-4.1-bin.zip">commons-collections-4.1-bin.zip</a></td>
+              <td><a href="https://www.apache.org/dist/commons/collections/binaries/commons-collections-4.1-bin.zip.sha1">sha1</a></td>
+              <td><a href="https://www.apache.org/dist/commons/collections/binaries/commons-collections-4.1-bin.zip.asc">pgp</a></td>
           </tr>
         </table>
       </subsection>
       <subsection name="Source">
         <table>
           <tr>
-              <td><a href="[preferred]/commons/collections/source/commons-collections4-4.1-src.tar.gz">commons-collections4-4.1-src.tar.gz</a></td>
-              <td><a href="http://www.apache.org/dist/commons/collections/source/commons-collections4-4.1-src.tar.gz.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/commons/collections/source/commons-collections4-4.1-src.tar.gz.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/collections/source/commons-collections-4.1-src.tar.gz">commons-collections-4.1-src.tar.gz</a></td>
+              <td><a href="https://www.apache.org/dist/commons/collections/source/commons-collections-4.1-src.tar.gz.sha1">sha1</a></td>
+              <td><a href="https://www.apache.org/dist/commons/collections/source/commons-collections-4.1-src.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
-              <td><a href="[preferred]/commons/collections/source/commons-collections4-4.1-src.zip">commons-collections4-4.1-src.zip</a></td>
-              <td><a href="http://www.apache.org/dist/commons/collections/source/commons-collections4-4.1-src.zip.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/commons/collections/source/commons-collections4-4.1-src.zip.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/collections/source/commons-collections-4.1-src.zip">commons-collections-4.1-src.zip</a></td>
+              <td><a href="https://www.apache.org/dist/commons/collections/source/commons-collections-4.1-src.zip.sha1">sha1</a></td>
+              <td><a href="https://www.apache.org/dist/commons/collections/source/commons-collections-4.1-src.zip.asc">pgp</a></td>
           </tr>
         </table>
       </subsection>
@@ -130,13 +176,13 @@
         <table>
           <tr>
               <td><a href="[preferred]/commons/collections/binaries/commons-collections-3.2.2-bin.tar.gz">commons-collections-3.2.2-bin.tar.gz</a></td>
-              <td><a href="http://www.apache.org/dist/commons/collections/binaries/commons-collections-3.2.2-bin.tar.gz.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/commons/collections/binaries/commons-collections-3.2.2-bin.tar.gz.asc">pgp</a></td>
+              <td><a href="https://www.apache.org/dist/commons/collections/binaries/commons-collections-3.2.2-bin.tar.gz.sha1">sha1</a></td>
+              <td><a href="https://www.apache.org/dist/commons/collections/binaries/commons-collections-3.2.2-bin.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
               <td><a href="[preferred]/commons/collections/binaries/commons-collections-3.2.2-bin.zip">commons-collections-3.2.2-bin.zip</a></td>
-              <td><a href="http://www.apache.org/dist/commons/collections/binaries/commons-collections-3.2.2-bin.zip.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/commons/collections/binaries/commons-collections-3.2.2-bin.zip.asc">pgp</a></td>
+              <td><a href="https://www.apache.org/dist/commons/collections/binaries/commons-collections-3.2.2-bin.zip.sha1">sha1</a></td>
+              <td><a href="https://www.apache.org/dist/commons/collections/binaries/commons-collections-3.2.2-bin.zip.asc">pgp</a></td>
           </tr>
         </table>
       </subsection>
@@ -144,13 +190,13 @@
         <table>
           <tr>
               <td><a href="[preferred]/commons/collections/source/commons-collections-3.2.2-src.tar.gz">commons-collections-3.2.2-src.tar.gz</a></td>
-              <td><a href="http://www.apache.org/dist/commons/collections/source/commons-collections-3.2.2-src.tar.gz.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/commons/collections/source/commons-collections-3.2.2-src.tar.gz.asc">pgp</a></td>
+              <td><a href="https://www.apache.org/dist/commons/collections/source/commons-collections-3.2.2-src.tar.gz.sha1">sha1</a></td>
+              <td><a href="https://www.apache.org/dist/commons/collections/source/commons-collections-3.2.2-src.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
               <td><a href="[preferred]/commons/collections/source/commons-collections-3.2.2-src.zip">commons-collections-3.2.2-src.zip</a></td>
-              <td><a href="http://www.apache.org/dist/commons/collections/source/commons-collections-3.2.2-src.zip.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/commons/collections/source/commons-collections-3.2.2-src.zip.asc">pgp</a></td>
+              <td><a href="https://www.apache.org/dist/commons/collections/source/commons-collections-3.2.2-src.zip.sha1">sha1</a></td>
+              <td><a href="https://www.apache.org/dist/commons/collections/source/commons-collections-3.2.2-src.zip.asc">pgp</a></td>
           </tr>
         </table>
       </subsection>
@@ -161,7 +207,7 @@
         </p>
         <ul>
           <li class="download"><a href="[preferred]/commons/collections/">browse download area</a></li>
-          <li><a href="http://archive.apache.org/dist/commons/collections/">archives...</a></li>
+          <li><a href="https://archive.apache.org/dist/commons/collections/">archives...</a></li>
         </ul>
     </section>
   </body>
diff -Nru libcommons-collections4-java-4.1/src/site/xdoc/history.xml libcommons-collections4-java-4.2/src/site/xdoc/history.xml
--- libcommons-collections4-java-4.1/src/site/xdoc/history.xml	2015-11-21 23:23:38.000000000 +0000
+++ libcommons-collections4-java-4.2/src/site/xdoc/history.xml	2018-07-08 00:18:18.000000000 +0000
@@ -83,13 +83,13 @@
 </p>
 
 <p>
-<b>Collections 2.1.1</b> was a patch release to v2.1.
-Unfortunately, v3.0 created a <a href="compatibility.html">binary incompatibility</a> in the IteratorUtils class.
-This patch was created as a work around, enabling v2.1.1 to be compatible with v3.1.
+<b>Collections 2.1.1</b> was a patch release to version 2.1.
+Unfortunately, version 3.0 created a <a href="compatibility.html">binary incompatibility</a> in the IteratorUtils class.
+This patch was created as a work around, enabling 2.1.1 to be compatible with 3.1.
 </p>
 
 <p>
-<b>Collections 3.1</b> fixed some bugs in v3.0 and adds a few new enhancements.
+<b>Collections 3.1</b> fixed some bugs in 3.0 and adds a few new enhancements.
 The most notable change is a new list implementation, TreeList, that is well balanced for insertions and removals at any index.
 Other changes included more classes implementing Serializable and a ReferenceIdentityMap.
 </p>
@@ -100,7 +100,7 @@
 </p>
 
 <p>
-<b>Collections 3.2.1</b> Re-packaged v3.2 release which is OSGi enabled.
+<b>Collections 3.2.1</b> Re-packaged 3.2 release which is OSGi enabled.
 </p>
 
 <p>
@@ -113,7 +113,7 @@
 
 <p>
 <b>Collections 4.0</b> represented a major revamp of collections by supporting
-new language features introduced with Java 1.5, mainly support for generics.
+new language features introduced with Java 5, mainly support for generics.
 </p>
 <p>
 New interfaces Put, Get and Trie were added, whereas the Buffer interface has
@@ -122,10 +122,10 @@
 </p>
 
 <p>
-<b>Collections 4.1</b> fixed some bugs in v4.0 and adds a few new enhancements.
+<b>Collections 4.1</b> fixes some bugs in 4.0 and adds a few new enhancements.
 The most notable changes are new interfaces MultiSet (a replacement for the Bag
 interface which is fully compliant to the general Collection contract) and
-MultiValuedMapeList (a replacement for the MultiMap interface) as well as fluent
+MultiValuedMapList (a replacement for the MultiMap interface) as well as fluent
 API for Iterable instances (FluentIterable).
 </p>
 <p>
@@ -133,6 +133,13 @@
 has been completely removed (see entry for Collections 3.2.2 for more details). 
 </p>
 
+<p>
+<b>Collections 4.2</b> fixes some bugs in 4.1 and adds a few new enhancements: 
+Updates the platform requirement from Java 6 to 7,
+adds Automatic-Module-Name MANIFEST entry for Java 9 compatibility, and
+adds a few new APIs.
+</p>
+
 </section>
 
 </body>
diff -Nru libcommons-collections4-java-4.1/src/site/xdoc/index.xml libcommons-collections4-java-4.2/src/site/xdoc/index.xml
--- libcommons-collections4-java-4.1/src/site/xdoc/index.xml	2015-11-25 21:52:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/site/xdoc/index.xml	2018-07-08 00:18:18.000000000 +0000
@@ -54,25 +54,26 @@
 as are various <a href="project-reports.html">project reports</a>.
 </p>
 <p>
-The JavaDoc API documents are available online:
+The Javadoc API documents are available online:
 </p>
 <ul>
-<li>The <a href="javadocs/api-release/index.html">current release 4.1</a></li>
+<li>The <a href="javadocs/api-release/index.html">current release 4.2</a></li>
 <li>The latest 3.x release - <a href="javadocs/api-3.2.2/index.html">version 3.2.2</a></li>
 <li>The latest 2.x release - <a href="javadocs/api-2.1.1/index.html">version 2.1.1</a></li>
 <li>The <a href="apidocs/index.html">latest SVN</a></li>
 </ul>
 <p>
-The <a href="source-repository.html">subversion repository</a> can be
-<a href="http://svn.apache.org/viewvc/commons/proper/collections/trunk/">browsed</a>.
+The <a href="source-repository.html">git repository</a> can be
+<a href="https://git-wip-us.apache.org/repos/asf?p=commons-collections.git">browsed</a>, and we have a mirror
+ on <a href="https://github.com/apache/commons-collections">GitHub</a>.
 </p>
 </section>
 <!-- ================================================== -->
 <section name="Releases">
 <p>
-The latest version is v4.1 - 
+The latest version is 4.2 - 
 <a href="http://commons.apache.org/collections/download_collections.cgi">Download now!</a><br />
-It is built for Java 1.6+ and the <a href="release_4_1.html">release notes</a> are also available.
+It is built for Java 7 and later, and the <a href="release_4_2.html">release notes</a> are also available.
 </p>
 <p>
 For previous releases, see the <a href="http://archive.apache.org/dist/commons/collections/">Apache Archive</a>
diff -Nru libcommons-collections4-java-4.1/src/site/xdoc/issue-tracking.xml libcommons-collections4-java-4.2/src/site/xdoc/issue-tracking.xml
--- libcommons-collections4-java-4.1/src/site/xdoc/issue-tracking.xml	2015-11-21 09:52:05.000000000 +0000
+++ libcommons-collections4-java-4.2/src/site/xdoc/issue-tracking.xml	2018-07-08 00:18:18.000000000 +0000
@@ -1,19 +1,19 @@
 <?xml version="1.0"?>
 <!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 -->
 <!--
  +======================================================================+
@@ -43,35 +43,35 @@
 -->
 <document>
   <properties>
-    <title>Commons Collections Issue tracking</title>
-    <author email="dev@commons.apache.org">Commons Documentation Team</author>
+    <title>Apache Commons Collections Issue tracking</title>
+    <author email="dev@commons.apache.org">Apache Commons Documentation Team</author>
   </properties>
   <body>
 
-    <section name="Commons Collections Issue tracking">
+    <section name="Apache Commons Collections Issue tracking">
       <p>
-      Commons Collections uses <a href="http://issues.apache.org/jira/">ASF JIRA</a> for tracking issues.
-      See the <a href="http://issues.apache.org/jira/browse/COLLECTIONS">Commons Collections JIRA project page</a>.
+      Apache Commons Collections uses <a href="https://issues.apache.org/jira/">ASF JIRA</a> for tracking issues.
+      See the <a href="https://issues.apache.org/jira/browse/COLLECTIONS">Apache Commons Collections JIRA project page</a>.
       </p>
 
       <p>
-      To use JIRA you may need to <a href="http://issues.apache.org/jira/secure/Signup!default.jspa">create an account</a>
+      To use JIRA you may need to <a href="https://issues.apache.org/jira/secure/Signup!default.jspa">create an account</a>
       (if you have previously created/updated Commons issues using Bugzilla an account will have been automatically
-      created and you can use the <a href="http://issues.apache.org/jira/secure/ForgotPassword!default.jspa">Forgot Password</a>
+      created and you can use the <a href="https://issues.apache.org/jira/secure/ForgotPassword!default.jspa">Forgot Password</a>
       page to get a new password).
       </p>
 
       <p>
       If you would like to report a bug, or raise an enhancement request with
-      Commons Collections please do the following:
+      Apache Commons Collections please do the following:
       <ol>
-        <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310465&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=1&amp;status=3&amp;status=4">Search existing open bugs</a>.
+        <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310465&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=1&amp;status=3&amp;status=4">Search existing open bugs</a>.
             If you find your issue listed then please add a comment with your details.</li>
         <li><a href="mail-lists.html">Search the mailing list archive(s)</a>.
             You may find your issue or idea has already been discussed.</li>
         <li>Decide if your issue is a bug or an enhancement.</li>
-        <li>Submit either a <a href="http://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310465&amp;issuetype=1&amp;priority=4&amp;assignee=-1">bug report</a>
-            or <a href="http://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310465&amp;issuetype=4&amp;priority=4&amp;assignee=-1">enhancement request</a>.</li>
+        <li>Submit either a <a href="https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310465&amp;issuetype=1&amp;priority=4&amp;assignee=-1">bug report</a>
+            or <a href="https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310465&amp;issuetype=4&amp;priority=4&amp;assignee=-1">enhancement request</a>.</li>
       </ol>
       </p>
 
@@ -80,7 +80,7 @@
       <ul>
         <li>the more information you provide, the better we can help you</li>
         <li>test cases are vital, particularly for any proposed enhancements</li>
-        <li>the developers of Commons Collections are all unpaid volunteers</li>
+        <li>the developers of Apache Commons Collections are all unpaid volunteers</li>
       </ul>
       </p>
 
@@ -92,9 +92,9 @@
       <p>
       You may also find these links useful:
       <ul>
-        <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310465&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=1&amp;status=3&amp;status=4">All Open Commons Collections bugs</a></li>
-        <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310465&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=5&amp;status=6">All Resolved Commons Collections bugs</a></li>
-        <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310465&amp;sorter/field=issuekey&amp;sorter/order=DESC">All Commons Collections bugs</a></li>
+        <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310465&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=1&amp;status=3&amp;status=4">All Open Apache Commons Collections bugs</a></li>
+        <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310465&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=5&amp;status=6">All Resolved Apache Commons Collections bugs</a></li>
+        <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310465&amp;sorter/field=issuekey&amp;sorter/order=DESC">All Apache Commons Collections bugs</a></li>
       </ul>
       </p>
     </section>
diff -Nru libcommons-collections4-java-4.1/src/site/xdoc/mail-lists.xml libcommons-collections4-java-4.2/src/site/xdoc/mail-lists.xml
--- libcommons-collections4-java-4.1/src/site/xdoc/mail-lists.xml	2015-11-21 09:52:05.000000000 +0000
+++ libcommons-collections4-java-4.2/src/site/xdoc/mail-lists.xml	2018-07-08 00:18:18.000000000 +0000
@@ -1,19 +1,19 @@
 <?xml version="1.0"?>
 <!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 -->
 <!--
  +======================================================================+
@@ -41,14 +41,14 @@
 -->
 <document>
   <properties>
-    <title>Commons Collections Mailing Lists</title>
-    <author email="dev@commons.apache.org">Commons Documentation Team</author>
+    <title>Apache Commons Collections Mailing Lists</title>
+    <author email="dev@commons.apache.org">Apache Commons Documentation Team</author>
   </properties>
   <body>
 
     <section name="Overview">
       <p>
-        <a href="index.html">Commons Collections</a> shares mailing lists with all the other 
+        <a href="index.html">Apache Commons Collections</a> shares mailing lists with all the other
         <a href="http://commons.apache.org/components.html">Commons Components</a>.
         To make it easier for people to only read messages related to components they are interested in,
         the convention in Commons is to prefix the subject line of messages with the component's name,
@@ -58,24 +58,27 @@
         </ul>
       </p>
       <p>
-        Questions related to the usage of Commons Collections should be posted to the
+        Questions related to the usage of Apache Commons Collections should be posted to the
         <a href="http://mail-archives.apache.org/mod_mbox/commons-user/">User List</a>.
         <br />
         The <a href="http://mail-archives.apache.org/mod_mbox/commons-dev/">Developer List</a>
-        is for questions and discussion related to the development of Commons Collections.
+        is for questions and discussion related to the development of Apache Commons Collections.
         <br />
         Please do not cross-post; developers are also subscribed to the user list.
+        <br />
+        You must be subscribed to post to the mailing lists.  Follow the Subscribe links below
+        to subscribe.
       </p>
       <p>
         <strong>Note:</strong> please don't send patches or attachments to any of the mailing lists.
-        Patches are best handled via the <a href="issue-tracking.html">Issue Tracking</a> system. 
-        Otherwise, please upload the file to a public server and include the URL in the mail. 
+        Patches are best handled via the <a href="issue-tracking.html">Issue Tracking</a> system.
+        Otherwise, please upload the file to a public server and include the URL in the mail.
       </p>
     </section>
 
-    <section name="Commons Collections Mailing Lists">
+    <section name="Apache Commons Collections Mailing Lists">
       <p>
-        <strong>Please prefix the subject line of any messages for <a href="index.html">Commons Collections</a>
+        <strong>Please prefix the subject line of any messages for <a href="index.html">Apache Commons Collections</a>
         with <i>[collections]</i></strong> - <i>thanks!</i>
         <br />
         <br />
@@ -96,7 +99,7 @@
           <td>
             <strong>Commons User List</strong>
             <br /><br />
-            Questions on using Commons Collections.
+            Questions on using Apache Commons Collections.
             <br /><br />
           </td>
           <td><a href="mailto:user-subscribe@commons.apache.org">Subscribe</a></td>
@@ -114,7 +117,7 @@
           <td>
             <strong>Commons Developer List</strong>
             <br /><br />
-            Discussion of development of Commons Collections.
+            Discussion of development of Apache Commons Collections.
             <br /><br />
           </td>
           <td><a href="mailto:dev-subscribe@commons.apache.org">Subscribe</a></td>
@@ -185,10 +188,10 @@
             General announcements of Apache project releases.
             <br /><br />
           </td>
-          <td><a class="externalLink" href="mailto:announce-subscribe@apache.org">Subscribe</a></td> 
-          <td><a class="externalLink" href="mailto:announce-unsubscribe@apache.org">Unsubscribe</a></td> 
+          <td><a class="externalLink" href="mailto:announce-subscribe@apache.org">Subscribe</a></td>
+          <td><a class="externalLink" href="mailto:announce-unsubscribe@apache.org">Unsubscribe</a></td>
           <td><i>read only</i></td>
-          <td><a class="externalLink" href="http://mail-archives.apache.org/mod_mbox/www-announce/">mail-archives.apache.org</a></td> 
+          <td><a class="externalLink" href="http://mail-archives.apache.org/mod_mbox/www-announce/">mail-archives.apache.org</a></td>
           <td><a class="externalLink" href="http://markmail.org/list/org.apache.announce/">markmail.org</a><br />
               <a class="externalLink" href="http://old.nabble.com/Apache-News-and-Announce-f109.html">old.nabble.com</a><br />
               <a class="externalLink" href="http://www.mail-archive.com/announce@apache.org/">www.mail-archive.com</a><br />
diff -Nru libcommons-collections4-java-4.1/src/site/xdoc/release_3_2_1.xml libcommons-collections4-java-4.2/src/site/xdoc/release_3_2_1.xml
--- libcommons-collections4-java-4.1/src/site/xdoc/release_3_2_1.xml	2015-11-21 09:52:05.000000000 +0000
+++ libcommons-collections4-java-4.2/src/site/xdoc/release_3_2_1.xml	2018-07-08 00:18:18.000000000 +0000
@@ -17,31 +17,31 @@
 -->
 <document>
  <properties>
-  <title>Release notes for v3.2.1</title>
+  <title>Release notes for version 3.2.1</title>
   <author email="dev@commons.apache.org">Commons Documentation Team</author>
  </properties>
 <body>
 
-<section name="Release notes for v3.2.1">
+<section name="Release notes for version 3.2.1">
 <p>
-These are the release notes for Commons Collections v3.2.1:
+These are the release notes for Commons Collections 3.2.1:
 </p>
-<hr />
+<hr/>
 <p>
 Commons collections is a project to develop and maintain collection classes
 based on and inspired by the JDK collection framework.
-This project is JDK1.2 compatible, and does not use JDK1.5 generics.
+This project is Java 1.2 compatible, and does not use Java 5 generics.
 </p>
 <p>
-This v3.2.1 release is simply a re-packaging of the v3.2 release, with appropriate
+This 3.2.1 release is simply a re-packaging of the 3.2 release, with appropriate
 OSGi meta data added to the jar's manifest file.
 </p>
 <hr />
 
 <center><h3>COMPATIBILITY</h3></center>
 <p>
-This release is fully source and binary compatible with v3.2. For changes since the
-v3.1 see the <a href="release_3_2.html">v3.2 Release Notes</a>.
+Release 3.2.1 is fully source and binary compatible with 3.2. For changes since version
+3.1 see the <a href="release_3_2.html">3.2 Release Notes</a>.
 </p>
 </section>
 
diff -Nru libcommons-collections4-java-4.1/src/site/xdoc/release_3_2_2.xml libcommons-collections4-java-4.2/src/site/xdoc/release_3_2_2.xml
--- libcommons-collections4-java-4.1/src/site/xdoc/release_3_2_2.xml	2015-11-22 00:37:47.000000000 +0000
+++ libcommons-collections4-java-4.2/src/site/xdoc/release_3_2_2.xml	2018-07-08 00:18:18.000000000 +0000
@@ -17,20 +17,20 @@
 -->
 <document>
  <properties>
-  <title>Release notes for v3.2.2</title>
+  <title>Release notes for version 3.2.2</title>
   <author email="dev@commons.apache.org">Commons Documentation Team</author>
  </properties>
 <body>
 
-<section name="Release notes for v3.2.2">
+<section name="Release notes for version 3.2.2">
 <hr />
 <p>
 Commons collections is a project to develop and maintain collection classes
 based on and inspired by the JDK collection framework.
-This project is JDK 1.3 compatible, and does not use JDK 1.5 generics.
+This project is Java 1.3 compatible, and does not use Java 5 generics.
 </p>
 <p>
-This v3.2.2 release is a bugfix release, fixing several bugs present in the previous
+This 3.2.2 release is a bugfix release, fixing several bugs present in the previous
 releases of the 3.2 branch. Additionally, this release provides a mitigation for a
 known remote code exploitation via the standard java object serialization mechanism.
 By default, serialization support for unsafe classes in the functor package is
@@ -43,8 +43,8 @@
 
 <h3>Compatibility</h3>
 <p>
-This release is fully source and binary compatible with v3.2. For changes since the
-v3.1 see the <a href="release_3_2.html">v3.2 Release Notes</a>. Note that the method 
+This release is fully source and binary compatible with 3.2. For changes since the
+3.1 release see the <a href="release_3_2.html">3.2 Release Notes</a>. Note that the method 
 'protected java.util.Set createSetBasedOnList(java.util.Set, java.util.List)' has been 
 added.
 </p>
diff -Nru libcommons-collections4-java-4.1/src/site/xdoc/release_3_2.xml libcommons-collections4-java-4.2/src/site/xdoc/release_3_2.xml
--- libcommons-collections4-java-4.1/src/site/xdoc/release_3_2.xml	2015-11-21 09:52:05.000000000 +0000
+++ libcommons-collections4-java-4.2/src/site/xdoc/release_3_2.xml	2018-07-08 00:18:18.000000000 +0000
@@ -17,20 +17,20 @@
 -->
 <document>
  <properties>
-  <title>Release notes for v3.2</title>
+  <title>Release notes for version 3.2</title>
   <author email="dev@commons.apache.org">Commons Documentation Team</author>
  </properties>
 <body>
 
-<section name="Release notes for v3.2">
+<section name="Release notes for version 3.2">
 <p>
-These are the release notes for Commons Collections v3.2:
+These are the release notes for Commons Collections 3.2:
 </p>
 <hr />
 <p>
 Commons collections is a project to develop and maintain collection classes
 based on and inspired by the JDK collection framework.
-This project is JDK1.2 compatible, and does not use JDK1.5 generics.
+This project is Java 1.2 compatible, and does not use Java 5 generics.
 </p>
 <p>
 This release adds various new classes and fixes a number of bugs.
@@ -40,19 +40,19 @@
 
 <center><h3>COMPATIBILITY</h3></center>
 <p>
-This release is fully source and binary compatible with v3.1.
+This release is fully source and binary compatible with 3.1.
 (Checks performed using JDiff and Clirr, thanks).
-Please check the bug fixes to ensure you weren't relying on the behaviour of a bug.
+Please check the bug fixes to ensure you weren't relying on the behavior of a bug.
 </p>
 <p>
 There are two new <i>deprecations</i>:<br />
-BeanMap is now deprecated and will be removed in v4.0.
+BeanMap is now deprecated and will be removed in 4.0.
 The class is now available in commons-beanutils (full jar version).
 This change was made to ensure that all bean related collections were in one place (ie. beanutils).
 If this causes major headaches to anyone please contact commons-dev at jakarta.apache.org.
 </p>
 <p>
-MultiHashMap is now deprecated and will be removed in v4.0.
+MultiHashMap is now deprecated and will be removed in 4.0.
 The class is now available as MultiValueMap in the map subpackage.
 This new version of the class is a decorator and can wrap maps other than HashMap
 making it much more flexible.
diff -Nru libcommons-collections4-java-4.1/src/site/xdoc/release_4_0.xml libcommons-collections4-java-4.2/src/site/xdoc/release_4_0.xml
--- libcommons-collections4-java-4.1/src/site/xdoc/release_4_0.xml	2015-11-22 00:37:47.000000000 +0000
+++ libcommons-collections4-java-4.2/src/site/xdoc/release_4_0.xml	2018-07-08 00:18:18.000000000 +0000
@@ -17,12 +17,12 @@
 -->
 <document>
  <properties>
-  <title>Release notes for v4.0</title>
+  <title>Release notes for version 4.0</title>
   <author email="dev@commons.apache.org">Commons Documentation Team</author>
  </properties>
 <body>
 
-<section name="Release notes for v4.0">
+<section name="Release notes for version 4.0">
 <hr />
 <p>
 Commons collections is a project to develop and maintain collection classes based on and inspired
@@ -278,7 +278,7 @@
 </ul>
 
 <p>
-For complete information on all changes for this release, please refer to the <a href="changes-report.html">Changelog</a>.
+For a full list of changes in this release, refer to the <a href="changes-report.html#a4.0">Change report</a>.
 </p>
 
 </section>
diff -Nru libcommons-collections4-java-4.1/src/site/xdoc/release_4_1.xml libcommons-collections4-java-4.2/src/site/xdoc/release_4_1.xml
--- libcommons-collections4-java-4.1/src/site/xdoc/release_4_1.xml	2015-11-22 00:37:47.000000000 +0000
+++ libcommons-collections4-java-4.2/src/site/xdoc/release_4_1.xml	2018-07-08 00:18:18.000000000 +0000
@@ -17,19 +17,19 @@
 -->
 <document>
  <properties>
-  <title>Release notes for v4.1</title>
+  <title>Release notes for version 4.1</title>
   <author email="dev@commons.apache.org">Commons Documentation Team</author>
  </properties>
 <body>
 
-<section name="Release notes for v4.1">
+<section name="Release notes for version 4.1">
 <hr />
 <p>
 Apache Commons Collections is a project to develop and maintain collection
 classes based on and inspired by the JDK collection framework.
 </p>
 <p>
-This v4.1 release is a minor and security release, fixing several bugs present in
+This 4.1 release is a minor and security release, fixing several bugs present in
 previous releases of the 4.X branch. Additionally, this release provides a mitigation
 for a known remote code exploitation via the standard java object serialization
 mechanism. Serialization support for unsafe classes in the functor package has been
diff -Nru libcommons-collections4-java-4.1/src/site/xdoc/release_4_2.xml libcommons-collections4-java-4.2/src/site/xdoc/release_4_2.xml
--- libcommons-collections4-java-4.1/src/site/xdoc/release_4_2.xml	1970-01-01 00:00:00.000000000 +0000
+++ libcommons-collections4-java-4.2/src/site/xdoc/release_4_2.xml	2018-07-08 00:18:18.000000000 +0000
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<document>
+ <properties>
+  <title>Release notes for v4.2</title>
+  <author email="dev@commons.apache.org">Commons Documentation Team</author>
+ </properties>
+<body>
+
+<section name="Release notes for version 4.2">
+<hr />
+<p>
+Apache Commons Collections is a project to develop and maintain collection
+classes based on and inspired by the JDK collection framework.
+</p>
+<p>
+This 4.2 release is a minor and updates the platform requirement from Java 6 to 7. 
+This release fixes several bugs present in previous releases of the 4.X branch. 
+</p>
+<p>
+All users are strongly encouraged to updated to this release.
+</p>
+
+<h3>Compatibility</h3>
+<ul>
+ <li>Java 7 or later is now required (version 4.1 required Java 6)</li>
+ <li>This release is source and binary compatible with the 4.0 release
+     of Commons Collections with the exception that some classes in the functor
+     package do not implement the Serializable interface anymore (see COLLECTIONS-580)</li>
+</ul>
+
+<center><h3>Major changes since 4.1</h3></center>
+<ul>
+<li>Updates the platform requirement from Java 6 to 7</li>
+<li>Add Automatic-Module-Name MANIFEST entry for Java 9 compatibility</li>
+<li>Added a few new APIs.</li>
+</ul>
+
+<h3>Security Changes</h3>
+<p>
+None.
+</p>
+
+<p>
+For a full list of changes in this release, refer to the <a href="changes-report.html#a4.2">Change report</a>.
+</p>
+</section>
+
+</body>
+</document>
diff -Nru libcommons-collections4-java-4.1/src/site/xdoc/security-reports.xml libcommons-collections4-java-4.2/src/site/xdoc/security-reports.xml
--- libcommons-collections4-java-4.1/src/site/xdoc/security-reports.xml	2015-11-21 09:51:39.000000000 +0000
+++ libcommons-collections4-java-4.2/src/site/xdoc/security-reports.xml	2018-07-08 00:18:18.000000000 +0000
@@ -53,7 +53,7 @@
         the descriptions here are incomplete, please report them
         privately to the Apache Security Team. Thank you.</p>
 
-        <subsection name="Fixed in Apache Commons Collections 3.2.2/4.1">
+        <subsection name="Fixed in Apache Commons Collections 3.2.2 and 4.1">
           <p><b>High: Remote Code Execution during object de-serialization</b></p>
           
           <p>The Apache Commons Collections library contains various classes
@@ -91,6 +91,9 @@
           <ol>
             <li>Vulnerability Report for Oracle Weblogic Server:
                 <a href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-4852">CVE-2015-4852</a></li>
+            <li>Vulnerability Report for Red Hat JBoss products:
+                <a href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-7501">CVE-2015-7501</a>
+                (<a href="https://access.redhat.com/security/cve/cve-2015-7501">Red Hat Portal</a>)</li>
             <li>Apache Commons
                 <a href="https://blogs.apache.org/foundation/entry/apache_commons_statement_to_widespread">statement</a>
                 to widespread Java object de-serialisation vulnerability</li>
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/AbstractArrayListTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/AbstractArrayListTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/AbstractArrayListTest.java	2013-04-17 17:37:03.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/AbstractArrayListTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -23,7 +23,6 @@
 /**
  * Abstract test class for ArrayList.
  *
- * @version $Id: AbstractArrayListTest.java 1469004 2013-04-17 17:37:03Z tn $
  */
 public abstract class AbstractArrayListTest<E> extends AbstractListTest<E> {
 
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/AbstractLinkedListTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/AbstractLinkedListTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/AbstractLinkedListTest.java	2013-04-30 14:27:35.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/AbstractLinkedListTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -34,7 +34,6 @@
  * you may still use this base set of cases.  Simply override the
  * test case (method) your {@link List} fails.
  *
- * @version $Id: AbstractLinkedListTest.java 1477661 2013-04-30 14:27:35Z sebb $
  */
 public abstract class AbstractLinkedListTest<T> extends AbstractListTest<T> {
 
@@ -207,7 +206,7 @@
      */
     @Override
     public Collection<T> makeConfirmedCollection() {
-        return new LinkedList<T>();
+        return new LinkedList<>();
     }
 
     /**
@@ -215,7 +214,7 @@
      */
     @Override
     public Collection<T> makeConfirmedFullCollection() {
-        final List<T> list = new LinkedList<T>();
+        final List<T> list = new LinkedList<>();
         list.addAll(Arrays.asList(getFullElements()));
         return list;
     }
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/AbstractObjectTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/AbstractObjectTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/AbstractObjectTest.java	2014-10-30 00:12:34.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/AbstractObjectTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -38,7 +38,6 @@
  * you may still use this base set of cases.  Simply override the
  * test case (method) your {@link Object} fails.
  *
- * @version $Id: AbstractObjectTest.java 1635348 2014-10-30 00:12:34Z ggregory $
  */
 public abstract class AbstractObjectTest extends BulkTest {
 
@@ -260,7 +259,7 @@
      *
      * @param o Object to serialize
      * @param path path to write the serialized Object
-     * @exception IOException
+     * @throws IOException
      */
     protected void writeExternalFormToDisk(final Serializable o, final String path) throws IOException {
         final FileOutputStream fileStream = new FileOutputStream(path);
@@ -277,7 +276,7 @@
      *
      * @param o Object to convert to bytes
      * @return serialized form of the Object
-     * @exception IOException
+     * @throws IOException
      */
     protected byte[] writeExternalFormToBytes(final Serializable o) throws IOException {
         final ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
@@ -292,8 +291,8 @@
      *
      * @param path path to the serialized Object
      * @return the Object at the given path
-     * @exception IOException
-     * @exception ClassNotFoundException
+     * @throws IOException
+     * @throws ClassNotFoundException
      */
     protected Object readExternalFormFromDisk(final String path) throws IOException, ClassNotFoundException {
         final FileInputStream stream = new FileInputStream(path);
@@ -310,8 +309,8 @@
      *
      * @param b byte array containing a serialized Object
      * @return Object contained in the bytes
-     * @exception IOException
-     * @exception ClassNotFoundException
+     * @throws IOException
+     * @throws ClassNotFoundException
      */
     protected Object readExternalFormFromBytes(final byte[] b) throws IOException, ClassNotFoundException {
         final ByteArrayInputStream stream = new ByteArrayInputStream(b);
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/AbstractTreeMapTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/AbstractTreeMapTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/AbstractTreeMapTest.java	2013-04-17 17:37:03.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/AbstractTreeMapTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -23,7 +23,6 @@
 /**
  * Tests TreeMap.
  *
- * @version $Id: AbstractTreeMapTest.java 1469004 2013-04-17 17:37:03Z tn $
  */
 public abstract class AbstractTreeMapTest<K, V> extends AbstractMapTest<K, V> {
 
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/ArrayStackTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/ArrayStackTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/ArrayStackTest.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/ArrayStackTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -23,7 +23,6 @@
 /**
  * Tests ArrayStack.
  *
- * @version $Id: ArrayStackTest.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 @SuppressWarnings("deprecation") // we test a deprecated class
 public class ArrayStackTest<E> extends AbstractArrayListTest<E> {
@@ -38,7 +37,7 @@
 
     @Override
     public ArrayStack<E> makeObject() {
-        return new ArrayStack<E>();
+        return new ArrayStack<>();
     }
 
     //-----------------------------------------------------------------------
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/bag/AbstractBagTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/bag/AbstractBagTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/bag/AbstractBagTest.java	2013-11-11 21:58:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/bag/AbstractBagTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -54,11 +54,10 @@
  * <p>
  * In addition to the generic collection tests (prefix testCollection) inherited
  * from AbstractCollectionTest, there are test methods that test the "normal" Bag
- * interface (prefix testBag). For Bag specific tests use the {@link #makeObject()} and 
+ * interface (prefix testBag). For Bag specific tests use the {@link #makeObject()} and
  * {@link #makeFullCollection()} methods instead of {@link #resetEmpty()} and resetFull(),
  * otherwise the collection will be wrapped by a {@link CollectionBag} decorator.
  *
- * @version $Id: AbstractBagTest.java 1540860 2013-11-11 21:58:27Z ebourg $
  */
 public abstract class AbstractBagTest<T> extends AbstractCollectionTest<T> {
 
@@ -77,7 +76,7 @@
      */
     @Override
     public Collection<T> makeConfirmedCollection() {
-        final ArrayList<T> list = new ArrayList<T>();
+        final ArrayList<T> list = new ArrayList<>();
         return list;
     }
 
@@ -157,11 +156,11 @@
     public void testBagEqualsSelf() {
         final Bag<T> bag = makeObject();
         assertTrue(bag.equals(bag));
-        
+
         if (!isAddSupported()) {
             return;
         }
-        
+
         bag.add((T) "elt");
         assertTrue(bag.equals(bag));
         bag.add((T) "elt"); // again
@@ -199,14 +198,14 @@
         if (!isRemoveSupported()) {
             return;
         }
-        
+
         final Bag<T> bag = makeObject();
         bag.add((T) "A", 2);
         assertEquals("Should have count of 2", 2, bag.getCount("A"));
         bag.add((T) "B");
         bag.add((T) "C");
         assertEquals("Should have count of 4", 4, bag.size());
-        final List<String> delete = new ArrayList<String>();
+        final List<String> delete = new ArrayList<>();
         delete.add("A");
         delete.add("B");
         bag.removeAll(delete);
@@ -221,7 +220,7 @@
         if (!isAddSupported()) {
             return;
         }
-        
+
         final Bag<T> bag = makeObject();
 
         assertEquals("Bag does not have at least 1 'A'", false, bag.contains("A"));
@@ -245,17 +244,17 @@
         if (!isAddSupported()) {
             return;
         }
-        
+
         final Bag<T> bag = makeObject();
-        final List<String> known = new ArrayList<String>();
-        final List<String> known1A = new ArrayList<String>();
+        final List<String> known = new ArrayList<>();
+        final List<String> known1A = new ArrayList<>();
         known1A.add("A");
-        final List<String> known2A = new ArrayList<String>();
+        final List<String> known2A = new ArrayList<>();
         known2A.add("A");
         known2A.add("A");
-        final List<String> known1B = new ArrayList<String>();
+        final List<String> known1B = new ArrayList<>();
         known1B.add("B");
-        final List<String> known1A1B = new ArrayList<String>();
+        final List<String> known1A1B = new ArrayList<>();
         known1A1B.add("A");
         known1A1B.add("B");
 
@@ -299,7 +298,7 @@
         if (!isAddSupported()) {
             return;
         }
-        
+
         final Bag<T> bag = makeObject();
         assertEquals("Should have 0 total items", 0, bag.size());
         bag.add((T) "A");
@@ -324,7 +323,7 @@
         if (!isAddSupported()) {
             return;
         }
-        
+
         final Bag<T> bag = makeObject();
         bag.add((T) "A");
         bag.add((T) "A");
@@ -332,7 +331,7 @@
         bag.add((T) "B");
         bag.add((T) "B");
         bag.add((T) "C");
-        final List<String> retains = new ArrayList<String>();
+        final List<String> retains = new ArrayList<>();
         retains.add("B");
         retains.add("C");
         bag.retainAll(retains);
@@ -547,7 +546,7 @@
         }
 
         final Bag<T> bag = makeObject();
-        final Bag<T> bag2 = new HashBag<T>();
+        final Bag<T> bag2 = new HashBag<>();
         assertEquals(true, bag.equals(bag2));
         bag.add((T) "A");
         assertEquals(false, bag.equals(bag2));
@@ -658,14 +657,14 @@
         public void resetEmpty() {
             AbstractBagTest.this.resetEmpty();
             TestBagUniqueSet.this.setCollection(AbstractBagTest.this.getCollection().uniqueSet());
-            TestBagUniqueSet.this.setConfirmed(new HashSet<T>(AbstractBagTest.this.getConfirmed()));
+            TestBagUniqueSet.this.setConfirmed(new HashSet<>(AbstractBagTest.this.getConfirmed()));
         }
 
         @Override
         public void resetFull() {
             AbstractBagTest.this.resetFull();
             TestBagUniqueSet.this.setCollection(AbstractBagTest.this.getCollection().uniqueSet());
-            TestBagUniqueSet.this.setConfirmed(new HashSet<T>(AbstractBagTest.this.getConfirmed()));
+            TestBagUniqueSet.this.setConfirmed(new HashSet<>(AbstractBagTest.this.getConfirmed()));
         }
 
         @Override
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/bag/AbstractSortedBagTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/bag/AbstractSortedBagTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/bag/AbstractSortedBagTest.java	2013-11-11 20:28:22.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/bag/AbstractSortedBagTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -26,7 +26,6 @@
  * methods and contracts.
  *
  * @since 3.0
- * @version $Id: AbstractSortedBagTest.java 1540833 2013-11-11 20:28:22Z tn $
  */
 public abstract class AbstractSortedBagTest<T> extends AbstractBagTest<T> {
 
@@ -97,7 +96,7 @@
      */
     @Override
     public SortedBag<T> makeConfirmedCollection() {
-        return new TreeBag<T>();
+        return new TreeBag<>();
     }
 
     //-----------------------------------------------------------------------
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/bag/CollectionBagTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/bag/CollectionBagTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/bag/CollectionBagTest.java	2013-11-19 00:49:24.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/bag/CollectionBagTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -29,9 +29,8 @@
  * Test class for {@link CollectionBag}.
  * <p>
  * Note: This test is mainly for serialization support, the CollectionBag decorator
- * is extensively used and tested in AbstractBagTest. 
+ * is extensively used and tested in AbstractBagTest.
  *
- * @version $Id: CollectionBagTest.java 1543267 2013-11-19 00:49:24Z ggregory $
  * @since 4.0
  */
 public class CollectionBagTest<T> extends AbstractCollectionTest<T> {
@@ -46,7 +45,7 @@
     }
 
     //-----------------------------------------------------------------------
-    
+
     @Override
     public Bag<T> makeObject() {
         return CollectionBag.collectionBag(new HashBag<T>());
@@ -59,7 +58,7 @@
      */
     @Override
     public Collection<T> makeConfirmedCollection() {
-        return new ArrayList<T>();
+        return new ArrayList<>();
     }
 
     /**
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/bag/CollectionSortedBagTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/bag/CollectionSortedBagTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/bag/CollectionSortedBagTest.java	2013-11-11 20:28:22.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/bag/CollectionSortedBagTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -30,9 +30,8 @@
  * Test class for {@link CollectionSortedBag}.
  * <p>
  * Note: This test is mainly for serialization support, the CollectionSortedBag decorator
- * is extensively used and tested in AbstractSortedBagTest. 
+ * is extensively used and tested in AbstractSortedBagTest.
  *
- * @version $Id: CollectionSortedBagTest.java 1540833 2013-11-11 20:28:22Z tn $
  * @since 4.0
  */
 public class CollectionSortedBagTest<T> extends AbstractCollectionTest<T> {
@@ -47,7 +46,7 @@
     }
 
     //-----------------------------------------------------------------------
-    
+
     /**
      * Overridden because SortedBags don't allow null elements (normally).
      * @return false
@@ -69,7 +68,7 @@
      */
     @Override
     public Collection<T> makeConfirmedCollection() {
-        return new ArrayList<T>();
+        return new ArrayList<>();
     }
 
     /**
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/bag/HashBagTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/bag/HashBagTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/bag/HashBagTest.java	2013-11-11 20:28:22.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/bag/HashBagTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -25,7 +25,6 @@
  * Extension of {@link AbstractBagTest} for exercising the {@link HashBag}
  * implementation.
  *
- * @version $Id: HashBagTest.java 1540833 2013-11-11 20:28:22Z tn $
  */
 public class HashBagTest<T> extends AbstractBagTest<T> {
 
@@ -41,7 +40,7 @@
 
     @Override
     public Bag<T> makeObject() {
-        return new HashBag<T>();
+        return new HashBag<>();
     }
 
     @Override
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/bag/PredicatedBagTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/bag/PredicatedBagTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/bag/PredicatedBagTest.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/bag/PredicatedBagTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -30,7 +30,6 @@
  * implementation.
  *
  * @since 3.0
- * @version $Id: PredicatedBagTest.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class PredicatedBagTest<T> extends AbstractBagTest<T> {
 
@@ -46,6 +45,7 @@
 
     protected Predicate<T> stringPredicate() {
         return new Predicate<T>() {
+            @Override
             public boolean evaluate(final T o) {
                 return o instanceof String;
             }
@@ -103,7 +103,7 @@
 
     @SuppressWarnings("unchecked")
     public void testIllegalDecorate() {
-        final HashBag<Object> elements = new HashBag<Object>();
+        final HashBag<Object> elements = new HashBag<>();
         elements.add("one");
         elements.add("two");
         elements.add(Integer.valueOf(3));
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/bag/PredicatedSortedBagTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/bag/PredicatedSortedBagTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/bag/PredicatedSortedBagTest.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/bag/PredicatedSortedBagTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -30,7 +30,6 @@
  * implementation.
  *
  * @since 3.0
- * @version $Id: PredicatedSortedBagTest.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class PredicatedSortedBagTest<T> extends AbstractSortedBagTest<T> {
 
@@ -48,6 +47,7 @@
 
     protected Predicate<T> stringPredicate() {
         return new Predicate<T>() {
+            @Override
             public boolean evaluate(final T o) {
                 return o instanceof String;
             }
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/bag/SynchronizedBagTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/bag/SynchronizedBagTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/bag/SynchronizedBagTest.java	2013-11-11 20:28:22.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/bag/SynchronizedBagTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -26,7 +26,6 @@
  * implementation.
  *
  * @since 4.0
- * @version $Id: SynchronizedBagTest.java 1540833 2013-11-11 20:28:22Z tn $
  */
 public class SynchronizedBagTest<T> extends AbstractBagTest<T> {
 
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/bag/TransformedBagTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/bag/TransformedBagTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/bag/TransformedBagTest.java	2013-11-11 20:28:22.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/bag/TransformedBagTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -28,7 +28,6 @@
  * implementation.
  *
  * @since 3.0
- * @version $Id: TransformedBagTest.java 1540833 2013-11-11 20:28:22Z tn $
  */
 public class TransformedBagTest<T> extends AbstractBagTest<T> {
 
@@ -69,7 +68,7 @@
 
     @SuppressWarnings("unchecked")
     public void testTransformedBag_decorateTransform() {
-        final Bag<T> originalBag = new HashBag<T>();
+        final Bag<T> originalBag = new HashBag<>();
         final Object[] els = new Object[] {"1", "3", "5", "7", "2", "4", "6"};
         for (final Object el : els) {
             originalBag.add((T) el);
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/bag/TransformedSortedBagTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/bag/TransformedSortedBagTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/bag/TransformedSortedBagTest.java	2013-11-11 20:28:22.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/bag/TransformedSortedBagTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -29,7 +29,6 @@
  * implementation.
  *
  * @since 3.0
- * @version $Id: TransformedSortedBagTest.java 1540833 2013-11-11 20:28:22Z tn $
  */
 public class TransformedSortedBagTest<T> extends AbstractSortedBagTest<T> {
 
@@ -65,7 +64,7 @@
     }
 
     public void testTransformedBag_decorateTransform() {
-        final Bag<Object> originalBag = new TreeBag<Object>();
+        final Bag<Object> originalBag = new TreeBag<>();
         final Object[] els = new Object[] {"1", "3", "5", "7", "2", "4", "6"};
         for (final Object el : els) {
             originalBag.add(el);
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/bag/TreeBagTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/bag/TreeBagTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/bag/TreeBagTest.java	2015-03-25 16:01:54.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/bag/TreeBagTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -28,7 +28,6 @@
  * Extension of {@link AbstractBagTest} for exercising the {@link TreeBag}
  * implementation.
  *
- * @version $Id: TreeBagTest.java 1669139 2015-03-25 16:01:54Z tn $
  */
 public class TreeBagTest<T> extends AbstractSortedBagTest<T> {
 
@@ -44,7 +43,7 @@
 
     @Override
     public SortedBag<T> makeObject() {
-        return new TreeBag<T>();
+        return new TreeBag<>();
     }
 
     @SuppressWarnings("unchecked")
@@ -58,7 +57,7 @@
     }
 
     public void testCollections265() {
-        final Bag<Object> bag = new TreeBag<Object>();
+        final Bag<Object> bag = new TreeBag<>();
         try {
             bag.add(new Object());
             fail("IllegalArgumentException expected");
@@ -68,16 +67,17 @@
     }
 
     public void testCollections555() {
-        final Bag<Object> bag = new TreeBag<Object>();
+        final Bag<Object> bag = new TreeBag<>();
         try {
             bag.add(null);
             fail("NullPointerException expected");
         } catch(final NullPointerException npe) {
             // expected;
         }
-        
-        final Bag<String> bag2 = new TreeBag<String>(new Comparator<String>() {
-            public int compare(String o1, String o2) {
+
+        final Bag<String> bag2 = new TreeBag<>(new Comparator<String>() {
+            @Override
+            public int compare(final String o1, final String o2) {
                 return o1.compareTo(o2);
             }
         });
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/bag/UnmodifiableBagTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/bag/UnmodifiableBagTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/bag/UnmodifiableBagTest.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/bag/UnmodifiableBagTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -30,7 +30,6 @@
  * {@link UnmodifiableBag} implementation.
  *
  * @since 4.0
- * @version $Id: UnmodifiableBagTest.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class UnmodifiableBagTest<E> extends AbstractBagTest<E> {
 
@@ -50,7 +49,7 @@
 
     @Override
     public Bag<E> makeFullCollection() {
-        final Bag<E> bag = new HashBag<E>();
+        final Bag<E> bag = new HashBag<>();
         bag.addAll(Arrays.asList(getFullElements()));
         return UnmodifiableBag.unmodifiableBag(bag);
     }
@@ -81,7 +80,7 @@
         assertTrue(makeObject() instanceof Unmodifiable);
         assertTrue(makeFullCollection() instanceof Unmodifiable);
     }
-    
+
     public void testDecorateFactory() {
         final Bag<E> queue = makeFullCollection();
         assertSame(queue, UnmodifiableBag.unmodifiableBag(queue));
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/bag/UnmodifiableSortedBagTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/bag/UnmodifiableSortedBagTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/bag/UnmodifiableSortedBagTest.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/bag/UnmodifiableSortedBagTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -30,7 +30,6 @@
  * {@link UnmodifiableSortedBag} implementation.
  *
  * @since 4.0
- * @version $Id: UnmodifiableSortedBagTest.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class UnmodifiableSortedBagTest<E> extends AbstractSortedBagTest<E> {
 
@@ -50,7 +49,7 @@
 
     @Override
     public SortedBag<E> makeFullCollection() {
-        final SortedBag<E> bag = new TreeBag<E>();
+        final SortedBag<E> bag = new TreeBag<>();
         bag.addAll(Arrays.asList(getFullElements()));
         return UnmodifiableSortedBag.unmodifiableSortedBag(bag);
     }
@@ -81,7 +80,7 @@
         assertTrue(makeObject() instanceof Unmodifiable);
         assertTrue(makeFullCollection() instanceof Unmodifiable);
     }
-    
+
     public void testDecorateFactory() {
         final SortedBag<E> queue = makeFullCollection();
         assertSame(queue, UnmodifiableSortedBag.unmodifiableSortedBag(queue));
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/BagUtilsTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/BagUtilsTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/BagUtilsTest.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/BagUtilsTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -34,7 +34,6 @@
 /**
  * Tests for BagUtils factory methods.
  *
- * @version $Id: BagUtilsTest.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class BagUtilsTest {
 
@@ -45,7 +44,7 @@
 
     @Test
     public void testSynchronizedBag() {
-        Bag<Object> bag = BagUtils.synchronizedBag(new HashBag<Object>());
+        final Bag<Object> bag = BagUtils.synchronizedBag(new HashBag<>());
         assertTrue("Returned object should be a SynchronizedBag.",
             bag instanceof SynchronizedBag);
         try {
@@ -58,7 +57,7 @@
 
     @Test
     public void testUnmodifiableBag() {
-        Bag<Object> bag = BagUtils.unmodifiableBag(new HashBag<Object>());
+        final Bag<Object> bag = BagUtils.unmodifiableBag(new HashBag<>());
         assertTrue("Returned object should be an UnmodifiableBag.",
             bag instanceof UnmodifiableBag);
         try {
@@ -67,13 +66,13 @@
         } catch (final NullPointerException ex) {
             // expected
         }
-        
+
         assertSame("UnmodifiableBag shall not be decorated", bag, BagUtils.unmodifiableBag(bag));
     }
 
     @Test
     public void testPredicatedBag() {
-        Bag<Object> bag = BagUtils.predicatedBag(new HashBag<Object>(), truePredicate);
+        final Bag<Object> bag = BagUtils.predicatedBag(new HashBag<>(), truePredicate);
         assertTrue("Returned object should be a PredicatedBag.",
             bag instanceof PredicatedBag);
         try {
@@ -83,7 +82,7 @@
             // expected
         }
         try {
-            BagUtils.predicatedBag(new HashBag<Object>(), null);
+            BagUtils.predicatedBag(new HashBag<>(), null);
             fail("Expecting NullPointerException for null predicate.");
         } catch (final NullPointerException ex) {
             // expected
@@ -92,7 +91,7 @@
 
     @Test
     public void testTransformedBag() {
-        Bag<Object> bag = BagUtils.transformingBag(new HashBag<Object>(), nopTransformer);
+        final Bag<Object> bag = BagUtils.transformingBag(new HashBag<>(), nopTransformer);
         assertTrue("Returned object should be an TransformedBag.",
             bag instanceof TransformedBag);
         try {
@@ -102,7 +101,7 @@
             // expected
         }
         try {
-            BagUtils.transformingBag(new HashBag<Object>(), null);
+            BagUtils.transformingBag(new HashBag<>(), null);
             fail("Expecting NullPointerException for null transformer.");
         } catch (final NullPointerException ex) {
             // expected
@@ -111,7 +110,7 @@
 
     @Test
     public void testSynchronizedSortedBag() {
-        Bag<Object> bag = BagUtils.synchronizedSortedBag(new TreeBag<Object>());
+        final Bag<Object> bag = BagUtils.synchronizedSortedBag(new TreeBag<>());
         assertTrue("Returned object should be a SynchronizedSortedBag.",
             bag instanceof SynchronizedSortedBag);
         try {
@@ -124,7 +123,7 @@
 
     @Test
     public void testUnmodifiableSortedBag() {
-        SortedBag<Object> bag = BagUtils.unmodifiableSortedBag(new TreeBag<Object>());
+        final SortedBag<Object> bag = BagUtils.unmodifiableSortedBag(new TreeBag<>());
         assertTrue("Returned object should be an UnmodifiableSortedBag.",
             bag instanceof UnmodifiableSortedBag);
         try {
@@ -133,13 +132,13 @@
         } catch (final NullPointerException ex) {
             // expected
         }
-        
+
         assertSame("UnmodifiableSortedBag shall not be decorated", bag, BagUtils.unmodifiableSortedBag(bag));
     }
 
     @Test
     public void testPredicatedSortedBag() {
-        Bag<Object> bag = BagUtils.predicatedSortedBag(new TreeBag<Object>(), truePredicate);
+        final Bag<Object> bag = BagUtils.predicatedSortedBag(new TreeBag<>(), truePredicate);
         assertTrue("Returned object should be a PredicatedSortedBag.",
             bag instanceof PredicatedSortedBag);
         try {
@@ -149,7 +148,7 @@
             // expected
         }
         try {
-            BagUtils.predicatedSortedBag(new TreeBag<Object>(), null);
+            BagUtils.predicatedSortedBag(new TreeBag<>(), null);
             fail("Expecting NullPointerException for null predicate.");
         } catch (final NullPointerException ex) {
             // expected
@@ -158,7 +157,7 @@
 
     @Test
     public void testTransformedSortedBag() {
-        Bag<Object> bag = BagUtils.transformingSortedBag(new TreeBag<Object>(), nopTransformer);
+        final Bag<Object> bag = BagUtils.transformingSortedBag(new TreeBag<>(), nopTransformer);
         assertTrue("Returned object should be an TransformedSortedBag",
             bag instanceof TransformedSortedBag);
         try {
@@ -168,7 +167,7 @@
             // expected
         }
         try {
-            BagUtils.transformingSortedBag(new TreeBag<Object>(), null);
+            BagUtils.transformingSortedBag(new TreeBag<>(), null);
             fail("Expecting NullPointerException for null transformer.");
         } catch (final NullPointerException ex) {
             // expected
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/bidimap/AbstractBidiMapTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/bidimap/AbstractBidiMapTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/bidimap/AbstractBidiMapTest.java	2013-11-11 21:58:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/bidimap/AbstractBidiMapTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -31,7 +31,6 @@
 /**
  * Abstract test class for {@link BidiMap} methods and contracts.
  *
- * @version $Id: AbstractBidiMapTest.java 1540860 2013-11-11 21:58:27Z ebourg $
  */
 public abstract class AbstractBidiMapTest<K, V> extends AbstractIterableMapTest<K, V> {
 
@@ -127,8 +126,8 @@
 
     public void verifyInverse() {
         assertEquals(map.size(), ((BidiMap<K, V>) map).inverseBidiMap().size());
-        final Map<K, V> map1 = new HashMap<K, V>(map);
-        final Map<V, K> map2 = new HashMap<V, K>(((BidiMap<K, V>) map).inverseBidiMap());
+        final Map<K, V> map1 = new HashMap<>(map);
+        final Map<V, K> map2 = new HashMap<>(((BidiMap<K, V>) map).inverseBidiMap());
         final Set<K> keys1 = map1.keySet();
         final Set<V> keys2 = map2.keySet();
         final Collection<V> values1 = map1.values();
@@ -319,7 +318,7 @@
     }
 
     private void removeByEntrySet(final BidiMap<?, ?> map, final Object key, final Object value) {
-        final Map<Object, Object> temp = new HashMap<Object, Object>();
+        final Map<Object, Object> temp = new HashMap<>();
         temp.put(key, value);
         map.entrySet().remove(temp.entrySet().iterator().next());
 
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecoratorTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecoratorTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecoratorTest.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapDecoratorTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -24,7 +24,8 @@
 /**
  * Test class for AbstractOrderedBidiMapDecorator.
  *
- * @version $Id: AbstractOrderedBidiMapDecoratorTest.java 1540695 2013-11-11 13:01:13Z ebourg $
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  */
 public class AbstractOrderedBidiMapDecoratorTest<K, V>
         extends AbstractOrderedBidiMapTest<K, V> {
@@ -38,12 +39,12 @@
      */
     @Override
     public OrderedBidiMap<K, V> makeObject() {
-        return new TestOrderedBidiMap<K, V>();
+        return new TestOrderedBidiMap<>();
     }
 
     @Override
     public SortedMap<K, V> makeConfirmedMap() {
-        return new TreeMap<K, V>();
+        return new TreeMap<>();
     }
 
     @Override
@@ -79,7 +80,7 @@
         @Override
         public OrderedBidiMap<V, K> inverseBidiMap() {
             if (inverse == null) {
-                inverse = new TestOrderedBidiMap<V, K>(decorated().inverseBidiMap());
+                inverse = new TestOrderedBidiMap<>(decorated().inverseBidiMap());
                 inverse.inverse = this;
             }
             return inverse;
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapTest.java	2013-11-11 21:58:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/bidimap/AbstractOrderedBidiMapTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -31,7 +31,6 @@
 /**
  * Abstract test class for {@link OrderedBidiMap} methods and contracts.
  *
- * @version $Id: AbstractOrderedBidiMapTest.java 1540860 2013-11-11 21:58:27Z ebourg $
  */
 public abstract class AbstractOrderedBidiMapTest<K, V> extends AbstractBidiMapTest<K, V> {
 
@@ -123,7 +122,7 @@
 
         resetFull();
         bidi = getMap();
-        final List<K> list = new ArrayList<K>(confirmed.keySet());
+        final List<K> list = new ArrayList<>(confirmed.keySet());
         Collections.reverse(list);
         final Iterator<K> it = list.iterator();
         K confirmedLast = it.next();
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapTest.java	2013-11-11 21:58:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/bidimap/AbstractSortedBidiMapTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -34,13 +34,12 @@
 /**
  * Abstract test class for {@link SortedBidiMap} methods and contracts.
  *
- * @version $Id: AbstractSortedBidiMapTest.java 1540860 2013-11-11 21:58:27Z ebourg $
  */
 public abstract class AbstractSortedBidiMapTest<K extends Comparable<K>, V extends Comparable<V>> extends AbstractOrderedBidiMapTest<K, V> {
 
     protected List<K> sortedKeys;
-    protected List<V> sortedValues = new ArrayList<V>();
-    protected SortedSet<V> sortedNewValues = new TreeSet<V>();
+    protected List<V> sortedValues = new ArrayList<>();
+    protected SortedSet<V> sortedNewValues = new TreeSet<>();
 
     public AbstractSortedBidiMapTest(final String testName) {
         super(testName);
@@ -48,7 +47,7 @@
         Collections.sort(sortedKeys);
         sortedKeys = Collections.unmodifiableList(sortedKeys);
 
-        final Map<K, V> map = new TreeMap<K, V>();
+        final Map<K, V> map = new TreeMap<>();
         addSampleMappings(map);
 
         sortedValues.addAll(map.values());
@@ -100,7 +99,7 @@
 
     @Override
     public SortedMap<K, V> makeConfirmedMap() {
-        return new TreeMap<K, V>();
+        return new TreeMap<>();
     }
 
     //-----------------------------------------------------------------------
@@ -646,15 +645,15 @@
 
     //-----------------------------------------------------------------------
     public BulkTest bulkTestHeadMap() {
-        return new AbstractSortedMapTest.TestHeadMap<K, V>(this);
+        return new AbstractSortedMapTest.TestHeadMap<>(this);
     }
 
     public BulkTest bulkTestTailMap() {
-        return new AbstractSortedMapTest.TestTailMap<K, V>(this);
+        return new AbstractSortedMapTest.TestTailMap<>(this);
     }
 
     public BulkTest bulkTestSubMap() {
-        return new AbstractSortedMapTest.TestSubMap<K, V>(this);
+        return new AbstractSortedMapTest.TestSubMap<>(this);
     }
 
 }
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/bidimap/DualHashBidiMapTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/bidimap/DualHashBidiMapTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/bidimap/DualHashBidiMapTest.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/bidimap/DualHashBidiMapTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -23,7 +23,6 @@
 /**
  * JUnit tests.
  *
- * @version $Id: DualHashBidiMapTest.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 public class DualHashBidiMapTest<K, V> extends AbstractBidiMapTest<K, V> {
 
@@ -40,7 +39,7 @@
      */
     @Override
     public DualHashBidiMap<K, V> makeObject() {
-        return new DualHashBidiMap<K, V>();
+        return new DualHashBidiMap<>();
     }
 
     /**
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMapTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMapTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMapTest.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/bidimap/DualLinkedHashBidiMapTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -23,7 +23,6 @@
 /**
  * JUnit tests.
  *
- * @version $Id: DualLinkedHashBidiMapTest.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 public class DualLinkedHashBidiMapTest<K, V> extends AbstractBidiMapTest<K, V> {
 
@@ -40,7 +39,7 @@
      */
     @Override
     public DualLinkedHashBidiMap<K, V> makeObject() {
-        return new DualLinkedHashBidiMap<K, V>();
+        return new DualLinkedHashBidiMap<>();
     }
 
     @Override
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap2Test.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap2Test.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap2Test.java	2013-11-19 00:41:17.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMap2Test.java	2018-07-08 00:18:18.000000000 +0000
@@ -37,7 +37,6 @@
 /**
  * JUnit tests.
  *
- * @version $Id: DualTreeBidiMap2Test.java 1543252 2013-11-19 00:41:17Z ggregory $
  */
 @SuppressWarnings("boxing")
 public class DualTreeBidiMap2Test<K extends Comparable<K>, V extends Comparable<V>> extends AbstractSortedBidiMapTest<K, V> {
@@ -52,14 +51,14 @@
 
     @Override
     public DualTreeBidiMap<K, V> makeObject() {
-        return new DualTreeBidiMap<K, V>(
-                new ReverseComparator<K>(ComparableComparator.<K> comparableComparator()),
-                new ReverseComparator<V>(ComparableComparator.<V> comparableComparator()));
+        return new DualTreeBidiMap<>(
+                new ReverseComparator<>(ComparableComparator.<K> comparableComparator()),
+                new ReverseComparator<>(ComparableComparator.<V> comparableComparator()));
     }
 
     @Override
     public TreeMap<K, V> makeConfirmedMap() {
-        return new TreeMap<K, V>(new ReverseComparator<K>(ComparableComparator.<K>comparableComparator()));
+        return new TreeMap<>(new ReverseComparator<>(ComparableComparator.<K>comparableComparator()));
     }
 
     public void testComparator() {
@@ -70,7 +69,7 @@
     }
 
     public void testComparator2() {
-        final DualTreeBidiMap<String, Integer> dtbm = new DualTreeBidiMap<String, Integer>(
+        final DualTreeBidiMap<String, Integer> dtbm = new DualTreeBidiMap<>(
                 String.CASE_INSENSITIVE_ORDER, null);
         dtbm.put("two", 0);
         dtbm.put("one", 1);
@@ -100,13 +99,14 @@
 
     private static class IntegerComparator implements Comparator<Integer>, Serializable{
         private static final long serialVersionUID = 1L;
+        @Override
         public int compare(final Integer o1, final Integer o2) {
             return o1.compareTo(o2);
         }
     }
 
     public void testCollections364() throws Exception {
-        final DualTreeBidiMap<String, Integer> original = new DualTreeBidiMap<String, Integer>(
+        final DualTreeBidiMap<String, Integer> original = new DualTreeBidiMap<>(
                 String.CASE_INSENSITIVE_ORDER, new IntegerComparator());
         final ByteArrayOutputStream buffer = new ByteArrayOutputStream();
         final ObjectOutputStream out = new ObjectOutputStream(buffer);
@@ -129,7 +129,7 @@
 
         // Sort by the comparator used in the makeEmptyBidiMap() method
         List<K> newSortedKeys = getAsList(getSampleKeys());
-        Collections.sort(newSortedKeys, new ReverseComparator<K>(ComparableComparator.<K>comparableComparator()));
+        Collections.sort(newSortedKeys, new ReverseComparator<>(ComparableComparator.<K>comparableComparator()));
         newSortedKeys = Collections.unmodifiableList(newSortedKeys);
 
         final Iterator<K> mapIter = sm.keySet().iterator();
@@ -153,7 +153,7 @@
      */
     @Override
     public String[] ignoredTests() {
-        String recursiveTest = "DualTreeBidiMap2Test.bulkTestInverseMap.bulkTestInverseMap";
+        final String recursiveTest = "DualTreeBidiMap2Test.bulkTestInverseMap.bulkTestInverseMap";
 
         if (IBMJDK16) {
             final String preSub = "DualTreeBidiMap2Test.bulkTestSubMap.";
@@ -166,14 +166,13 @@
                     preTail + "bulkTestMapEntrySet.testCollectionIteratorRemove",
                     preTail + "bulkTestMapEntrySet.testCollectionRemoveAll",
                     preTail + "bulkTestMapKeySet.testCollectionIteratorRemove",
-                    preTail + "bulkTestMapKeySet.testCollectionRemoveAll",                    
+                    preTail + "bulkTestMapKeySet.testCollectionRemoveAll",
                     preTail + "bulkTestMapValues.testCollectionClear",
                     preTail + "bulkTestMapValues.testCollectionRemoveAll",
                     preTail + "bulkTestMapValues.testCollectionRetainAll"
             };
-        } else {
-            return new String[] { recursiveTest };
         }
+        return new String[] { recursiveTest };
     }
 
 
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMapTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMapTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMapTest.java	2013-11-14 20:57:02.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/bidimap/DualTreeBidiMapTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -23,7 +23,6 @@
 /**
  * JUnit tests.
  *
- * @version $Id: DualTreeBidiMapTest.java 1542074 2013-11-14 20:57:02Z tn $
  */
 public class DualTreeBidiMapTest<K extends Comparable<K>, V extends Comparable<V>> extends AbstractSortedBidiMapTest<K, V> {
 
@@ -40,7 +39,7 @@
      */
     @Override
     public DualTreeBidiMap<K, V> makeObject() {
-        return new DualTreeBidiMap<K, V>();
+        return new DualTreeBidiMap<>();
     }
 
     /**
@@ -61,14 +60,13 @@
                     preTail + "bulkTestMapEntrySet.testCollectionIteratorRemove",
                     preTail + "bulkTestMapEntrySet.testCollectionRemoveAll",
                     preTail + "bulkTestMapKeySet.testCollectionIteratorRemove",
-                    preTail + "bulkTestMapKeySet.testCollectionRemoveAll",                    
+                    preTail + "bulkTestMapKeySet.testCollectionRemoveAll",
                     preTail + "bulkTestMapValues.testCollectionClear",
                     preTail + "bulkTestMapValues.testCollectionRemoveAll",
                     preTail + "bulkTestMapValues.testCollectionRetainAll"
             };
-        } else {
-            return new String[] { recursiveTest };
         }
+        return new String[] { recursiveTest };
     }
 
 //    public void testCreate() throws Exception {
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/bidimap/TreeBidiMapTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/bidimap/TreeBidiMapTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/bidimap/TreeBidiMapTest.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/bidimap/TreeBidiMapTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -25,7 +25,6 @@
 /**
  * JUnit tests.
  *
- * @version $Id: TreeBidiMapTest.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 public class TreeBidiMapTest<K extends Comparable<K>, V extends Comparable<V>> extends AbstractOrderedBidiMapTest<K, V> {
 
@@ -39,12 +38,12 @@
 
     @Override
     public BidiMap<K, V> makeObject() {
-        return new TreeBidiMap<K, V>();
+        return new TreeBidiMap<>();
     }
 
     @Override
     public TreeMap<K, V> makeConfirmedMap() {
-        return new TreeMap<K, V>();
+        return new TreeMap<>();
     }
 
     /**
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMapTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMapTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMapTest.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableBidiMapTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -28,7 +28,6 @@
 /**
  * JUnit tests.
  *
- * @version $Id: UnmodifiableBidiMapTest.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class UnmodifiableBidiMapTest<K, V> extends AbstractBidiMapTest<K, V> {
 
@@ -47,14 +46,14 @@
 
     @Override
     public BidiMap<K, V> makeFullMap() {
-        final BidiMap<K, V> bidi = new DualHashBidiMap<K, V>();
+        final BidiMap<K, V> bidi = new DualHashBidiMap<>();
         addSampleMappings(bidi);
         return UnmodifiableBidiMap.unmodifiableBidiMap(bidi);
     }
 
     @Override
     public Map<K, V> makeConfirmedMap() {
-        return new HashMap<K, V>();
+        return new HashMap<>();
     }
 
     /**
@@ -86,7 +85,7 @@
         assertTrue(makeObject() instanceof Unmodifiable);
         assertTrue(makeFullMap() instanceof Unmodifiable);
     }
-    
+
     public void testDecorateFactory() {
         final BidiMap<K, V> map = makeFullMap();
         assertSame(map, UnmodifiableBidiMap.unmodifiableBidiMap(map));
@@ -96,5 +95,5 @@
             fail();
         } catch (final NullPointerException ex) {}
     }
-    
+
 }
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMapTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMapTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMapTest.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableOrderedBidiMapTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -28,7 +28,6 @@
 /**
  * JUnit tests.
  *
- * @version $Id: UnmodifiableOrderedBidiMapTest.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class UnmodifiableOrderedBidiMapTest<K extends Comparable<K>, V extends Comparable<V>> extends AbstractOrderedBidiMapTest<K, V> {
 
@@ -47,14 +46,14 @@
 
     @Override
     public OrderedBidiMap<K, V> makeFullMap() {
-        final OrderedBidiMap<K, V> bidi = new TreeBidiMap<K, V>();
+        final OrderedBidiMap<K, V> bidi = new TreeBidiMap<>();
         addSampleMappings(bidi);
         return UnmodifiableOrderedBidiMap.unmodifiableOrderedBidiMap(bidi);
     }
 
     @Override
     public Map<K, V> makeConfirmedMap() {
-        return new TreeMap<K, V>();
+        return new TreeMap<>();
     }
 
     /**
@@ -96,7 +95,7 @@
         assertTrue(makeObject() instanceof Unmodifiable);
         assertTrue(makeFullMap() instanceof Unmodifiable);
     }
-    
+
     public void testDecorateFactory() {
         final OrderedBidiMap<K, V> map = makeFullMap();
         assertSame(map, UnmodifiableOrderedBidiMap.unmodifiableOrderedBidiMap(map));
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMapTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMapTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMapTest.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/bidimap/UnmodifiableSortedBidiMapTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -28,7 +28,6 @@
 /**
  * JUnit tests.
  *
- * @version $Id: UnmodifiableSortedBidiMapTest.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class UnmodifiableSortedBidiMapTest<K extends Comparable<K>, V extends Comparable<V>> extends AbstractSortedBidiMapTest<K, V> {
 
@@ -48,14 +47,14 @@
 
     @Override
     public SortedBidiMap<K, V> makeFullMap() {
-        final SortedBidiMap<K, V> bidi = new DualTreeBidiMap<K, V>();
+        final SortedBidiMap<K, V> bidi = new DualTreeBidiMap<>();
         addSampleMappings(bidi);
         return UnmodifiableSortedBidiMap.unmodifiableSortedBidiMap(bidi);
     }
 
     @Override
     public SortedMap<K, V> makeConfirmedMap() {
-        return new TreeMap<K, V>();
+        return new TreeMap<>();
     }
 
     @Override
@@ -102,7 +101,7 @@
         assertTrue(makeObject() instanceof Unmodifiable);
         assertTrue(makeFullMap() instanceof Unmodifiable);
     }
-    
+
     public void testDecorateFactory() {
         final SortedBidiMap<K, V> map = makeFullMap();
         assertSame(map, UnmodifiableSortedBidiMap.unmodifiableSortedBidiMap(map));
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/BulkTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/BulkTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/BulkTest.java	2013-11-14 20:57:02.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/BulkTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -133,7 +133,6 @@
  *  The ordinary {@link TestSuite} constructor doesn't know how to
  *  interpret bulk test methods.
  *
- *  @version $Id: BulkTest.java 1542074 2013-11-14 20:57:02Z tn $
  */
 public class BulkTest extends TestCase implements Cloneable {
 
@@ -314,7 +313,7 @@
          result.setName(prefix);
 
          final BulkTest bulk = makeFirstTestCase(startingClass);
-         ignored = new ArrayList<String>();
+         ignored = new ArrayList<>();
          final String[] s = bulk.ignoredTests();
          if (s != null) {
              ignored.addAll(Arrays.asList(s));
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/ClosureUtilsTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/ClosureUtilsTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/ClosureUtilsTest.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/ClosureUtilsTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -35,7 +35,6 @@
  * Tests the ClosureUtils class.
  *
  * @since 3.0
- * @version $Id: ClosureUtilsTest.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class ClosureUtilsTest {
 
@@ -44,6 +43,7 @@
     static class MockClosure<T> implements Closure<T> {
         int count = 0;
 
+        @Override
         public void execute(final T object) {
             count++;
         }
@@ -56,6 +56,7 @@
     static class MockTransformer<T> implements Transformer<T, T> {
         int count = 0;
 
+        @Override
         public T transform(final T object) {
             count++;
             return object;
@@ -111,11 +112,11 @@
 
     @Test
     public void testForClosure() {
-        final MockClosure<Object> cmd = new MockClosure<Object>();
+        final MockClosure<Object> cmd = new MockClosure<>();
         ClosureUtils.forClosure(5, cmd).execute(null);
         assertEquals(5, cmd.count);
-        assertSame(NOPClosure.INSTANCE, ClosureUtils.forClosure(0, new MockClosure<Object>()));
-        assertSame(NOPClosure.INSTANCE, ClosureUtils.forClosure(-1, new MockClosure<Object>()));
+        assertSame(NOPClosure.INSTANCE, ClosureUtils.forClosure(0, new MockClosure<>()));
+        assertSame(NOPClosure.INSTANCE, ClosureUtils.forClosure(-1, new MockClosure<>()));
         assertSame(NOPClosure.INSTANCE, ClosureUtils.forClosure(1, null));
         assertSame(NOPClosure.INSTANCE, ClosureUtils.forClosure(3, null));
         assertSame(cmd, ClosureUtils.forClosure(1, cmd));
@@ -126,11 +127,11 @@
 
     @Test
     public void testWhileClosure() {
-        MockClosure<Object> cmd = new MockClosure<Object>();
+        MockClosure<Object> cmd = new MockClosure<>();
         ClosureUtils.whileClosure(FalsePredicate.falsePredicate(), cmd).execute(null);
         assertEquals(0, cmd.count);
 
-        cmd = new MockClosure<Object>();
+        cmd = new MockClosure<>();
         ClosureUtils.whileClosure(PredicateUtils.uniquePredicate(), cmd).execute(null);
         assertEquals(1, cmd.count);
 
@@ -153,11 +154,11 @@
 
     @Test
     public void testDoWhileClosure() {
-        MockClosure<Object> cmd = new MockClosure<Object>();
+        MockClosure<Object> cmd = new MockClosure<>();
         ClosureUtils.doWhileClosure(cmd, FalsePredicate.falsePredicate()).execute(null);
         assertEquals(1, cmd.count);
 
-        cmd = new MockClosure<Object>();
+        cmd = new MockClosure<>();
         ClosureUtils.doWhileClosure(cmd, PredicateUtils.uniquePredicate()).execute(null);
         assertEquals(2, cmd.count);
 
@@ -173,21 +174,21 @@
     @Test
     @SuppressWarnings("unchecked")
     public void testChainedClosure() {
-        MockClosure<Object> a = new MockClosure<Object>();
-        MockClosure<Object> b = new MockClosure<Object>();
+        MockClosure<Object> a = new MockClosure<>();
+        MockClosure<Object> b = new MockClosure<>();
         ClosureUtils.chainedClosure(a, b).execute(null);
         assertEquals(1, a.count);
         assertEquals(1, b.count);
 
-        a = new MockClosure<Object>();
-        b = new MockClosure<Object>();
+        a = new MockClosure<>();
+        b = new MockClosure<>();
         ClosureUtils.<Object>chainedClosure(new Closure[] {a, b, a}).execute(null);
         assertEquals(2, a.count);
         assertEquals(1, b.count);
 
-        a = new MockClosure<Object>();
-        b = new MockClosure<Object>();
-        Collection<Closure<Object>> coll = new ArrayList<Closure<Object>>();
+        a = new MockClosure<>();
+        b = new MockClosure<>();
+        Collection<Closure<Object>> coll = new ArrayList<>();
         coll.add(b);
         coll.add(a);
         coll.add(b);
@@ -215,7 +216,7 @@
             fail();
         } catch (final NullPointerException ex) {}
         try {
-            coll = new ArrayList<Closure<Object>>();
+            coll = new ArrayList<>();
             coll.add(null);
             coll.add(null);
             ClosureUtils.chainedClosure(coll);
@@ -228,23 +229,23 @@
 
     @Test
     public void testIfClosure() {
-        MockClosure<Object> a = new MockClosure<Object>();
+        MockClosure<Object> a = new MockClosure<>();
         MockClosure<Object> b = null;
         ClosureUtils.ifClosure(TruePredicate.truePredicate(), a).execute(null);
         assertEquals(1, a.count);
 
-        a = new MockClosure<Object>();
+        a = new MockClosure<>();
         ClosureUtils.ifClosure(FalsePredicate.<Object>falsePredicate(), a).execute(null);
         assertEquals(0, a.count);
 
-        a = new MockClosure<Object>();
-        b = new MockClosure<Object>();
+        a = new MockClosure<>();
+        b = new MockClosure<>();
         ClosureUtils.ifClosure(TruePredicate.<Object>truePredicate(), a, b).execute(null);
         assertEquals(1, a.count);
         assertEquals(0, b.count);
 
-        a = new MockClosure<Object>();
-        b = new MockClosure<Object>();
+        a = new MockClosure<>();
+        b = new MockClosure<>();
         ClosureUtils.ifClosure(FalsePredicate.<Object>falsePredicate(), a, b).execute(null);
         assertEquals(0, a.count);
         assertEquals(1, b.count);
@@ -256,8 +257,8 @@
     @Test
     @SuppressWarnings("unchecked")
     public void testSwitchClosure() {
-        final MockClosure<String> a = new MockClosure<String>();
-        final MockClosure<String> b = new MockClosure<String>();
+        final MockClosure<String> a = new MockClosure<>();
+        final MockClosure<String> b = new MockClosure<>();
         ClosureUtils.<String>switchClosure(
             new Predicate[] { EqualPredicate.equalPredicate("HELLO"), EqualPredicate.equalPredicate("THERE") },
             new Closure[] { a, b }).execute("WELL");
@@ -274,7 +275,7 @@
 
         a.reset();
         b.reset();
-        final MockClosure<String> c = new MockClosure<String>();
+        final MockClosure<String> c = new MockClosure<>();
         ClosureUtils.<String>switchClosure(
             new Predicate[] { EqualPredicate.equalPredicate("HELLO"), EqualPredicate.equalPredicate("THERE") },
             new Closure[] { a, b }, c).execute("WELL");
@@ -284,7 +285,7 @@
 
         a.reset();
         b.reset();
-        final Map<Predicate<String>, Closure<String>> map = new HashMap<Predicate<String>, Closure<String>>();
+        final Map<Predicate<String>, Closure<String>> map = new HashMap<>();
         map.put(EqualPredicate.equalPredicate("HELLO"), a);
         map.put(EqualPredicate.equalPredicate("THERE"), b);
         ClosureUtils.<String>switchClosure(map).execute(null);
@@ -347,9 +348,9 @@
 
     @Test
     public void testSwitchMapClosure() {
-        final MockClosure<String> a = new MockClosure<String>();
-        final MockClosure<String> b = new MockClosure<String>();
-        final Map<String, Closure<String>> map = new HashMap<String, Closure<String>>();
+        final MockClosure<String> a = new MockClosure<>();
+        final MockClosure<String> b = new MockClosure<>();
+        final Map<String, Closure<String>> map = new HashMap<>();
         map.put("HELLO", a);
         map.put("THERE", b);
         ClosureUtils.switchMapClosure(map).execute(null);
@@ -368,7 +369,7 @@
         a.reset();
         b.reset();
         map.clear();
-        final MockClosure<String> c = new MockClosure<String>();
+        final MockClosure<String> c = new MockClosure<>();
         map.put("HELLO", a);
         map.put("THERE", b);
         map.put(null, c);
@@ -390,7 +391,7 @@
 
     @Test
     public void testTransformerClosure() {
-        final MockTransformer<Object> mock = new MockTransformer<Object>();
+        final MockTransformer<Object> mock = new MockTransformer<>();
         final Closure<Object> closure = ClosureUtils.asClosure(mock);
         closure.execute(null);
         assertEquals(1, mock.count);
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java	2014-04-06 19:58:37.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -67,7 +67,7 @@
  * <p>
  * <b>Fixture Methods</b>
  * <p>
- * Fixtures are used to verify that the the operation results in correct state
+ * Fixtures are used to verify that the operation results in correct state
  * for the collection.  Basically, the operation is performed against your
  * collection implementation, and an identical operation is performed against a
  * <i>confirmed</i> collection implementation.  A confirmed collection
@@ -90,7 +90,7 @@
  * {@link #confirmed}, the {@link #verify()} method is invoked to compare
  * the results.  You may want to override {@link #verify()} to perform
  * additional verifications.  For instance, when testing the collection
- * views of a map, {@link org.apache.commons.collections4.map.AbstractMapTest AbstractTestMap} 
+ * views of a map, {@link org.apache.commons.collections4.map.AbstractMapTest AbstractTestMap}
  * would override {@link #verify()} to make
  * sure the map is changed after the collection view is changed.
  * <p>
@@ -106,7 +106,7 @@
  * <p>
  * If you're extending {@link org.apache.commons.collections4.list.AbstractListTest AbstractListTest},
  * {@link org.apache.commons.collections4.set.AbstractSetTest AbstractTestSet},
- * or {@link org.apache.commons.collections4.bag.AbstractBagTest AbstractBagTest}, 
+ * or {@link org.apache.commons.collections4.bag.AbstractBagTest AbstractBagTest},
  * you probably don't have to worry about the
  * above methods, because those three classes already override the methods
  * to provide standard JDK confirmed collections.<P>
@@ -117,7 +117,6 @@
  * you may still use this base set of cases.  Simply override the
  * test case (method) your {@link Collection} fails.
  *
- * @version $Id: AbstractCollectionTest.java 1585335 2014-04-06 19:58:37Z tn $
  */
 public abstract class AbstractCollectionTest<E> extends AbstractObjectTest {
 
@@ -372,7 +371,7 @@
      * Creates a new Map Entry that is independent of the first and the map.
      */
     public Map.Entry<E, E> cloneMapEntry(final Map.Entry<E, E> entry) {
-        final HashMap<E, E> map = new HashMap<E, E>();
+        final HashMap<E, E> map = new HashMap<>();
         map.put(entry.getKey(), entry.getValue());
         return map.entrySet().iterator().next();
     }
@@ -391,7 +390,7 @@
     @SuppressWarnings("unchecked")
     public E[] getFullElements() {
         if (isNullSupported()) {
-            final ArrayList<E> list = new ArrayList<E>();
+            final ArrayList<E> list = new ArrayList<>();
             list.addAll(Arrays.asList(getFullNonNullElements()));
             list.add(4, null);
             return (E[]) list.toArray();
@@ -672,7 +671,7 @@
 
         resetFull();
         elements = getOtherElements();
-        for (Object element : elements) {
+        for (final Object element : elements) {
             assertTrue("Full collection shouldn't contain element",
                     !getCollection().contains(element));
         }
@@ -683,7 +682,7 @@
      */
     public void testCollectionContainsAll() {
         resetEmpty();
-        Collection<E> col = new HashSet<E>();
+        Collection<E> col = new HashSet<>();
         assertTrue("Every Collection should contain all elements of an " +
                 "empty Collection.", getCollection().containsAll(col));
         col.addAll(Arrays.asList(getOtherElements()));
@@ -713,7 +712,7 @@
         // make sure calls to "containsAll" don't change anything
         verify();
 
-        col = new ArrayList<E>();
+        col = new ArrayList<>();
         col.addAll(Arrays.asList(getFullElements()));
         col.addAll(Arrays.asList(getFullElements()));
         assertTrue("Full collection should containAll duplicate full elements",
@@ -763,7 +762,7 @@
         }
         assertTrue("Iterator should be finished", !it1.hasNext());
 
-        final ArrayList<E> list = new ArrayList<E>();
+        final ArrayList<E> list = new ArrayList<>();
         it1 = getCollection().iterator();
         for (int i = 0; i < getCollection().size(); i++) {
             final E next = it1.next();
@@ -862,7 +861,7 @@
 
         resetEmpty();
         final E[] elements = getFullElements();
-        for (E element : elements) {
+        for (final E element : elements) {
             assertTrue("Shouldn't remove nonexistent element", !getCollection().remove(element));
             verify();
         }
@@ -870,7 +869,7 @@
         final E[] other = getOtherElements();
 
         resetFull();
-        for (E element : other) {
+        for (final E element : other) {
             assertTrue("Shouldn't remove nonexistent other element", !getCollection().remove(element));
             verify();
         }
@@ -912,7 +911,7 @@
         verify();
 
         assertTrue("Empty collection removeAll should return false for nonempty input",
-                   !getCollection().removeAll(new ArrayList<E>(getCollection())));
+                   !getCollection().removeAll(new ArrayList<>(getCollection())));
         verify();
 
         resetFull();
@@ -925,8 +924,8 @@
         verify();
 
         assertTrue("Full collection removeAll should return true for full elements",
-                getCollection().removeAll(new HashSet<E>(getCollection())));
-        getConfirmed().removeAll(new HashSet<E>(getConfirmed()));
+                getCollection().removeAll(new HashSet<>(getCollection())));
+        getConfirmed().removeAll(new HashSet<>(getConfirmed()));
         verify();
 
         resetFull();
@@ -940,7 +939,7 @@
         verify();
 
         assertTrue("Collection should shrink after removeAll", getCollection().size() < size);
-        for (E element : all) {
+        for (final E element : all) {
             assertTrue("Collection shouldn't contain removed element", !getCollection().contains(element));
         }
     }
@@ -992,13 +991,13 @@
             getConfirmed().retainAll(elements.subList(min, max));
             verify();
 
-            for (E element : getCollection()) {
+            for (final E element : getCollection()) {
                 assertTrue("Collection only contains retained element", elements.subList(min, max).contains(element));
             }
         }
 
         resetFull();
-        final HashSet<E> set = new HashSet<E>(elements);
+        final HashSet<E> set = new HashSet<>(elements);
         size = getCollection().size();
         assertTrue("Collection shouldn't change from retainAll without " +
                    "duplicate elements", !getCollection().retainAll(set));
@@ -1099,7 +1098,7 @@
 
         // Figure out if they're all the same class
         // TODO: It'd be nicer to detect a common superclass
-        final HashSet<Class<?>> classes = new HashSet<Class<?>>();
+        final HashSet<Class<?>> classes = new HashSet<>();
         for (final Object element : array) {
             classes.add(element == null ? null : element.getClass());
         }
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/collection/CompositeCollectionTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/collection/CompositeCollectionTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/collection/CompositeCollectionTest.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/collection/CompositeCollectionTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -28,7 +28,6 @@
  * {@link CompositeCollection} implementation.
  *
  * @since 3.0
- * @version $Id: CompositeCollectionTest.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 public class CompositeCollectionTest<E> extends AbstractCollectionTest<E> {
 
@@ -55,12 +54,12 @@
      */
     @Override
     public Collection<E> makeObject() {
-        return new CompositeCollection<E>();
+        return new CompositeCollection<>();
     }
 
     @Override
     public Collection<E> makeConfirmedCollection() {
-        return new HashSet<E>();
+        return new HashSet<>();
     }
 
     @Override
@@ -74,10 +73,10 @@
      */
     @Override
     public Collection<E> makeFullCollection() {
-        final CompositeCollection<E> compositeCollection = new CompositeCollection<E>();
+        final CompositeCollection<E> compositeCollection = new CompositeCollection<>();
         final E[] elements = getFullElements();
         for (final E element : elements) {
-            final Collection<E> summand = new HashSet<E>();
+            final Collection<E> summand = new HashSet<>();
             summand.add(element);
             compositeCollection.addComposited(summand);
         }
@@ -89,7 +88,7 @@
      */
     @Override
     public Collection<E> makeConfirmedFullCollection() {
-        final Collection<E> collection = new HashSet<E>();
+        final Collection<E> collection = new HashSet<>();
         collection.addAll(Arrays.asList(getFullElements()));
         return collection;
     }
@@ -117,9 +116,9 @@
     protected Collection<E> two;
 
     protected void setUpTest() {
-        c = new CompositeCollection<E>();
-        one = new HashSet<E>();
-        two = new HashSet<E>();
+        c = new CompositeCollection<>();
+        one = new HashSet<>();
+        two = new HashSet<>();
     }
 
     @SuppressWarnings("serial")
@@ -127,6 +126,7 @@
         setUpTest();
         c.setMutator(new CompositeCollection.CollectionMutator<E>() {
 
+            @Override
             public boolean add(final CompositeCollection<E> composite, final List<Collection<E>> collections, final E obj) {
                 for (final Collection<E> coll : collections) {
                     coll.add(obj);
@@ -134,6 +134,7 @@
                 return true;
             }
 
+            @Override
             public boolean addAll(final CompositeCollection<E> composite,
                     final List<Collection<E>> collections, final Collection<? extends E> coll) {
                 for (final Collection<E> collection : collections) {
@@ -142,6 +143,7 @@
                 return true;
             }
 
+            @Override
             public boolean remove(final CompositeCollection<E> composite,
                     final List<Collection<E>> collections, final Object obj) {
                 for (final Collection<E> collection : collections) {
@@ -155,7 +157,7 @@
     @SuppressWarnings("unchecked")
     public void testSize() {
         setUpTest();
-        final HashSet<E> set = new HashSet<E>();
+        final HashSet<E> set = new HashSet<>();
         set.add((E) "a");
         set.add((E) "b");
         c.addComposited(set);
@@ -165,11 +167,11 @@
     @SuppressWarnings("unchecked")
     public void testMultipleCollectionsSize() {
         setUpTest();
-        final HashSet<E> set = new HashSet<E>();
+        final HashSet<E> set = new HashSet<>();
         set.add((E) "a");
         set.add((E) "b");
         c.addComposited(set);
-        final HashSet<E> other = new HashSet<E>();
+        final HashSet<E> other = new HashSet<>();
         other.add((E) "c");
         c.addComposited(other);
         assertEquals(set.size() + other.size(), c.size());
@@ -179,7 +181,7 @@
     public void testIsEmpty() {
         setUpTest();
         assertTrue(c.isEmpty());
-        final HashSet<E> empty = new HashSet<E>();
+        final HashSet<E> empty = new HashSet<>();
         c.addComposited(empty);
         assertTrue(c.isEmpty());
         empty.add((E) "a");
@@ -243,6 +245,7 @@
     public void testAddAllMutator() {
         setUpTest();
         c.setMutator(new CompositeCollection.CollectionMutator<E>() {
+            @Override
             public boolean add(final CompositeCollection<E> composite,
                     final List<Collection<E>> collections, final E obj) {
                 for (final Collection<E> collection : collections) {
@@ -251,6 +254,7 @@
                 return true;
             }
 
+            @Override
             public boolean addAll(final CompositeCollection<E> composite,
                     final List<Collection<E>> collections, final Collection<? extends E> coll) {
                 for (final Collection<E> collection : collections) {
@@ -259,6 +263,7 @@
                 return true;
             }
 
+            @Override
             public boolean remove(final CompositeCollection<E> composite,
                     final List<Collection<E>> collections, final Object obj) {
                 return false;
@@ -276,6 +281,7 @@
     public void testAddMutator() {
         setUpTest();
         c.setMutator(new CompositeCollection.CollectionMutator<E>() {
+            @Override
             public boolean add(final CompositeCollection<E> composite,
                     final List<Collection<E>> collections, final E obj) {
                 for (final Collection<E> collection : collections) {
@@ -284,6 +290,7 @@
                 return true;
             }
 
+            @Override
             public boolean addAll(final CompositeCollection<E> composite,
                     final List<Collection<E>> collections, final Collection<? extends E> coll) {
                 for (final Collection<E> collection : collections) {
@@ -292,6 +299,7 @@
                 return true;
             }
 
+            @Override
             public boolean remove(final CompositeCollection<E> composite,
                     final List<Collection<E>> collections, final Object obj) {
                 return false;
@@ -323,7 +331,7 @@
         one.add((E) "1");
         two.add((E) "2");
         c.addComposited(one, two);
-        final Collection<E> toCollection = new HashSet<E>();
+        final Collection<E> toCollection = new HashSet<>();
         toCollection.addAll(c);
         assertTrue(toCollection.containsAll(c));
         assertEquals(c.size(), toCollection.size());
@@ -349,7 +357,7 @@
         two.add((E) "2");
         two.add((E) "1");
         // need separate list to remove, as otherwise one clears itself
-        final Collection<E> removing = new ArrayList<E>(one);
+        final Collection<E> removing = new ArrayList<>(one);
         c.addComposited(one, two);
         c.removeAll(removing);
         assertTrue(!c.contains("1"));
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/collection/IndexedCollectionTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/collection/IndexedCollectionTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/collection/IndexedCollectionTest.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/collection/IndexedCollectionTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -31,7 +31,6 @@
  * {@link IndexedCollection} implementation.
  *
  * @since 4.0
- * @version $Id: IndexedCollectionTest.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 @SuppressWarnings("boxing")
 public class IndexedCollectionTest extends AbstractCollectionTest<String> {
@@ -53,6 +52,7 @@
     private static final class IntegerTransformer implements Transformer<String, Integer>, Serializable {
         private static final long serialVersionUID = 809439581555072949L;
 
+        @Override
         public Integer transform(final String input) {
             return Integer.valueOf(input);
         }
@@ -65,7 +65,7 @@
 
     @Override
     public Collection<String> makeConfirmedCollection() {
-        return new ArrayList<String>();
+        return new ArrayList<>();
     }
 
     @Override
@@ -80,14 +80,14 @@
 
     @Override
     public Collection<String> makeFullCollection() {
-        final List<String> list = new ArrayList<String>();
+        final List<String> list = new ArrayList<>();
         list.addAll(Arrays.asList(getFullElements()));
         return decorateCollection(list);
     }
 
     @Override
     public Collection<String> makeConfirmedFullCollection() {
-        final List<String> list = new ArrayList<String>();
+        final List<String> list = new ArrayList<>();
         list.addAll(Arrays.asList(getFullElements()));
         return list;
     }
@@ -147,7 +147,7 @@
     }
 
     public void testReindexUpdatesIndexWhenDecoratedCollectionIsModifiedSeparately() throws Exception {
-        final Collection<String> original = new ArrayList<String>();
+        final Collection<String> original = new ArrayList<>();
         final IndexedCollection<Integer, String> indexed = decorateUniqueCollection(original);
 
         original.add("1");
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/collection/PredicatedCollectionBuilderTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/collection/PredicatedCollectionBuilderTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/collection/PredicatedCollectionBuilderTest.java	2015-01-24 14:03:40.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/collection/PredicatedCollectionBuilderTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -29,9 +29,8 @@
 
 /**
  * Tests the PredicatedCollection.Builder class.
- * 
+ *
  * @since 4.1
- * @version $Id: PredicatedCollectionBuilderTest.java 1654518 2015-01-24 14:03:40Z tn $
  */
 public class PredicatedCollectionBuilderTest {
 
@@ -40,7 +39,7 @@
      */
     @Test
     public void addPass() {
-        PredicatedCollection.Builder<String> builder = PredicatedCollection.notNullBuilder();
+        final PredicatedCollection.Builder<String> builder = PredicatedCollection.notNullBuilder();
         builder.add("test");
         Assert.assertEquals(builder.createPredicatedList().size(), 1);
     }
@@ -50,10 +49,10 @@
      */
     @Test
     public void addFail() {
-        PredicatedCollection.Builder<String> builder = PredicatedCollection.notNullBuilder();
+        final PredicatedCollection.Builder<String> builder = PredicatedCollection.notNullBuilder();
         builder.add((String) null);
         Assert.assertTrue(builder.createPredicatedList().isEmpty());
-        
+
         Assert.assertEquals(1, builder.rejectedElements().size());
     }
 
@@ -62,30 +61,30 @@
      */
     @Test
     public void addAllPass() {
-        PredicatedCollection.Builder<String> builder = PredicatedCollection.notNullBuilder();
+        final PredicatedCollection.Builder<String> builder = PredicatedCollection.notNullBuilder();
         builder.addAll(Arrays.asList("test1", null, "test2"));
         Assert.assertEquals(builder.createPredicatedList().size(), 2);
     }
 
     @Test
     public void createPredicatedCollectionWithNotNullPredicate() {
-        PredicatedCollection.Builder<String> builder = PredicatedCollection.notNullBuilder();
+        final PredicatedCollection.Builder<String> builder = PredicatedCollection.notNullBuilder();
         builder.add("test1");
         builder.add((String) null);
 
-        List<String> predicatedList = builder.createPredicatedList();
+        final List<String> predicatedList = builder.createPredicatedList();
         checkPredicatedCollection1(predicatedList);
-        
-        Set<String> predicatedSet = builder.createPredicatedSet();
+
+        final Set<String> predicatedSet = builder.createPredicatedSet();
         checkPredicatedCollection1(predicatedSet);
 
-        Bag<String> predicatedBag = builder.createPredicatedBag();
+        final Bag<String> predicatedBag = builder.createPredicatedBag();
         checkPredicatedCollection1(predicatedBag);
 
-        Queue<String> predicatedQueue = builder.createPredicatedQueue();
+        final Queue<String> predicatedQueue = builder.createPredicatedQueue();
         checkPredicatedCollection1(predicatedQueue);
     }
-    
+
     private void checkPredicatedCollection1(final Collection<String> collection) {
         Assert.assertEquals(1, collection.size());
 
@@ -95,30 +94,30 @@
         try {
             collection.add(null);
             Assert.fail("Expecting IllegalArgumentException for failing predicate!");
-        } catch (IllegalArgumentException iae) {
+        } catch (final IllegalArgumentException iae) {
             // expected
         }
     }
 
     @Test
     public void createPredicatedCollectionWithPredicate() {
-        OddPredicate p = new OddPredicate();
-        PredicatedCollection.Builder<Integer> builder = PredicatedCollection.builder(p);
+        final OddPredicate p = new OddPredicate();
+        final PredicatedCollection.Builder<Integer> builder = PredicatedCollection.builder(p);
 
         builder.add(1);
         builder.add(2);
         builder.add(3);
 
-        List<Integer> predicatedList = builder.createPredicatedList();
+        final List<Integer> predicatedList = builder.createPredicatedList();
         checkPredicatedCollection2(predicatedList);
-        
-        Set<Integer> predicatedSet = builder.createPredicatedSet();
+
+        final Set<Integer> predicatedSet = builder.createPredicatedSet();
         checkPredicatedCollection2(predicatedSet);
 
-        Bag<Integer> predicatedBag = builder.createPredicatedBag();
+        final Bag<Integer> predicatedBag = builder.createPredicatedBag();
         checkPredicatedCollection2(predicatedBag);
 
-        Queue<Integer> predicatedQueue = builder.createPredicatedQueue();
+        final Queue<Integer> predicatedQueue = builder.createPredicatedQueue();
         checkPredicatedCollection2(predicatedQueue);
     }
 
@@ -128,7 +127,7 @@
         try {
             collection.add(4);
             Assert.fail("Expecting IllegalArgumentException for failing predicate!");
-        } catch (IllegalArgumentException iae) {
+        } catch (final IllegalArgumentException iae) {
         }
         Assert.assertEquals(2, collection.size());
 
@@ -137,7 +136,8 @@
     }
 
     private static class OddPredicate implements Predicate<Integer> {
-        public boolean evaluate(Integer value) {
+        @Override
+        public boolean evaluate(final Integer value) {
             return value % 2 == 1;
         }
     }
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/collection/PredicatedCollectionTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/collection/PredicatedCollectionTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/collection/PredicatedCollectionTest.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/collection/PredicatedCollectionTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -25,11 +25,10 @@
 import org.apache.commons.collections4.functors.TruePredicate;
 
 /**
- * Extension of {@link AbstractCollectionTest} for exercising the 
+ * Extension of {@link AbstractCollectionTest} for exercising the
  * {@link PredicatedCollection} implementation.
  *
  * @since 3.0
- * @version $Id: PredicatedCollectionTest.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 public class PredicatedCollectionTest<E> extends AbstractCollectionTest<E> {
 
@@ -52,7 +51,7 @@
 
     @Override
     public Collection<E> makeConfirmedCollection() {
-        return new ArrayList<E>();
+        return new ArrayList<>();
     }
 
     @Override
@@ -63,14 +62,14 @@
 
     @Override
     public Collection<E> makeFullCollection() {
-        final List<E> list = new ArrayList<E>();
+        final List<E> list = new ArrayList<>();
         list.addAll(Arrays.asList(getFullElements()));
         return decorateCollection(list, truePredicate);
     }
 
     @Override
     public Collection<E> makeConfirmedFullCollection() {
-        final List<E> list = new ArrayList<E>();
+        final List<E> list = new ArrayList<>();
         list.addAll(Arrays.asList(getFullElements()));
         return list;
     }
@@ -78,6 +77,7 @@
     //-----------------------------------------------------------------------
     protected Predicate<E> testPredicate =
         new Predicate<E>() {
+            @Override
             public boolean evaluate(final E o) {
                 return o instanceof String;
             }
@@ -104,7 +104,7 @@
     @SuppressWarnings("unchecked")
     public void testIllegalAddAll() {
         final Collection<E> c = makeTestCollection();
-        final List<E> elements = new ArrayList<E>();
+        final List<E> elements = new ArrayList<>();
         elements.add((E) "one");
         elements.add((E) "two");
         elements.add((E) Integer.valueOf(3));
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/collection/SynchronizedCollectionTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/collection/SynchronizedCollectionTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/collection/SynchronizedCollectionTest.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/collection/SynchronizedCollectionTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -25,7 +25,6 @@
  * {@link SynchronizedCollection} implementation.
  *
  * @since 3.1
- * @version $Id: SynchronizedCollectionTest.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 public class SynchronizedCollectionTest<E> extends AbstractCollectionTest<E> {
 
@@ -41,12 +40,12 @@
 
     @Override
     public Collection<E> makeConfirmedCollection() {
-        return new ArrayList<E>();
+        return new ArrayList<>();
     }
 
     @Override
     public Collection<E> makeConfirmedFullCollection() {
-        final ArrayList<E> list = new ArrayList<E>();
+        final ArrayList<E> list = new ArrayList<>();
         list.addAll(Arrays.asList(getFullElements()));
         return list;
     }
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/collection/TransformedCollectionTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/collection/TransformedCollectionTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/collection/TransformedCollectionTest.java	2013-11-11 21:58:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/collection/TransformedCollectionTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -30,11 +30,11 @@
  * implementation.
  *
  * @since 3.0
- * @version $Id: TransformedCollectionTest.java 1540860 2013-11-11 21:58:27Z ebourg $
  */
 public class TransformedCollectionTest extends AbstractCollectionTest<Object> {
 
     private static class StringToInteger implements Transformer<Object, Object> {
+        @Override
         public Object transform(final Object input) {
             return Integer.valueOf((String) input);
         }
@@ -50,24 +50,24 @@
     //-----------------------------------------------------------------------
     @Override
     public Collection<Object> makeConfirmedCollection() {
-        return new ArrayList<Object>();
+        return new ArrayList<>();
     }
 
     @Override
     public Collection<Object> makeConfirmedFullCollection() {
-        final List<Object> list = new ArrayList<Object>();
+        final List<Object> list = new ArrayList<>();
         list.addAll(Arrays.asList(getFullElements()));
         return list;
     }
 
     @Override
     public Collection<Object> makeObject() {
-        return TransformedCollection.transformingCollection(new ArrayList<Object>(), NOOP_TRANSFORMER);
+        return TransformedCollection.transformingCollection(new ArrayList<>(), NOOP_TRANSFORMER);
     }
 
     @Override
     public Collection<Object> makeFullCollection() {
-        final List<Object> list = new ArrayList<Object>();
+        final List<Object> list = new ArrayList<>();
         list.addAll(Arrays.asList(getFullElements()));
         return TransformedCollection.transformingCollection(list, NOOP_TRANSFORMER);
     }
@@ -85,7 +85,7 @@
 
     //-----------------------------------------------------------------------
     public void testTransformedCollection() {
-        final Collection<Object> coll = TransformedCollection.transformingCollection(new ArrayList<Object>(), STRING_TO_INTEGER_TRANSFORMER);
+        final Collection<Object> coll = TransformedCollection.transformingCollection(new ArrayList<>(), STRING_TO_INTEGER_TRANSFORMER);
         assertEquals(0, coll.size());
         final Object[] elements = getFullElements();
         for (int i = 0; i < elements.length; i++) {
@@ -99,7 +99,7 @@
     }
 
     public void testTransformedCollection_decorateTransform() {
-        final Collection<Object> originalCollection = new ArrayList<Object>();
+        final Collection<Object> originalCollection = new ArrayList<>();
         final Object[] elements = getFullElements();
         Collections.addAll(originalCollection, elements);
         final Collection<Object> collection = TransformedCollection.transformedCollection(originalCollection, TransformedCollectionTest.STRING_TO_INTEGER_TRANSFORMER);
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/collection/UnmodifiableBoundedCollectionTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/collection/UnmodifiableBoundedCollectionTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/collection/UnmodifiableBoundedCollectionTest.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/collection/UnmodifiableBoundedCollectionTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -27,8 +27,7 @@
 /**
  * Extension of {@link AbstractCollectionTest} for exercising the
  * {@link UnmodifiableBoundedCollection} implementation.
- * 
- * @version $Id: UnmodifiableBoundedCollectionTest.java 1686855 2015-06-22 13:00:27Z tn $
+ *
  */
 public class UnmodifiableBoundedCollectionTest<E> extends AbstractCollectionTest<E> {
 
@@ -46,18 +45,18 @@
     @Override
     public BoundedCollection<E> makeFullCollection() {
         final E[] allElements = getFullElements();
-        final BoundedCollection<E> coll = FixedSizeList.<E>fixedSizeList(new ArrayList<E>(Arrays.asList(allElements)));
+        final BoundedCollection<E> coll = FixedSizeList.<E>fixedSizeList(new ArrayList<>(Arrays.asList(allElements)));
         return UnmodifiableBoundedCollection.unmodifiableBoundedCollection(coll);
     }
 
     @Override
     public Collection<E> makeConfirmedCollection() {
-        return new ArrayList<E>();
+        return new ArrayList<>();
     }
 
     @Override
     public Collection<E> makeConfirmedFullCollection() {
-        final ArrayList<E> list = new ArrayList<E>();
+        final ArrayList<E> list = new ArrayList<>();
         list.addAll(Arrays.asList(getFullElements()));
         return list;
     }
@@ -81,14 +80,14 @@
     public String getCompatibilityVersion() {
         return "4";
     }
-    
+
     //-----------------------------------------------------------------------
 
     public void testUnmodifiable() {
         assertTrue(makeObject() instanceof Unmodifiable);
         assertTrue(makeFullCollection() instanceof Unmodifiable);
     }
-    
+
     public void testDecorateFactory() {
         final BoundedCollection<E> coll = makeFullCollection();
         assertSame(coll, UnmodifiableBoundedCollection.unmodifiableBoundedCollection(coll));
@@ -98,5 +97,5 @@
             fail();
         } catch (final NullPointerException ex) {}
     }
-    
+
 }
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/collection/UnmodifiableCollectionTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/collection/UnmodifiableCollectionTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/collection/UnmodifiableCollectionTest.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/collection/UnmodifiableCollectionTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -28,7 +28,6 @@
  * {@link UnmodifiableCollection} implementation.
  *
  * @since 3.0
- * @version $Id: UnmodifiableCollectionTest.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class UnmodifiableCollectionTest<E> extends AbstractCollectionTest<E> {
 
@@ -44,19 +43,19 @@
 
     @Override
     public Collection<E> makeFullCollection() {
-        final List<E> list = new ArrayList<E>();
+        final List<E> list = new ArrayList<>();
         list.addAll(Arrays.asList(getFullElements()));
         return UnmodifiableCollection.unmodifiableCollection(list);
     }
 
     @Override
     public Collection<E> makeConfirmedCollection() {
-        return new ArrayList<E>();
+        return new ArrayList<>();
     }
 
     @Override
     public Collection<E> makeConfirmedFullCollection() {
-        final ArrayList<E> list = new ArrayList<E>();
+        final ArrayList<E> list = new ArrayList<>();
         list.addAll(Arrays.asList(getFullElements()));
         return list;
     }
@@ -72,12 +71,12 @@
     }
 
     //-----------------------------------------------------------------------
-    
+
     public void testUnmodifiable() {
         assertTrue(makeObject() instanceof Unmodifiable);
         assertTrue(makeFullCollection() instanceof Unmodifiable);
     }
-    
+
     public void testDecorateFactory() {
         final Collection<E> coll = makeFullCollection();
         assertSame(coll, UnmodifiableCollection.unmodifiableCollection(coll));
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/CollectionUtilsTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/CollectionUtilsTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/CollectionUtilsTest.java	2015-11-23 21:42:01.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/CollectionUtilsTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -57,7 +57,6 @@
 /**
  * Tests for CollectionUtils.
  *
- * @version $Id: CollectionUtilsTest.java 1715973 2015-11-23 21:42:01Z tn $
  */
 @SuppressWarnings("boxing")
 public class CollectionUtilsTest extends MockTestCase {
@@ -114,11 +113,11 @@
 
     private Iterable<Number> iterableB2 = null;
 
-    private final Collection<Integer> emptyCollection = new ArrayList<Integer>(1);
+    private final Collection<Integer> emptyCollection = new ArrayList<>(1);
 
     @Before
     public void setUp() {
-        collectionA = new ArrayList<Integer>();
+        collectionA = new ArrayList<>();
         collectionA.add(1);
         collectionA.add(2);
         collectionA.add(2);
@@ -129,7 +128,7 @@
         collectionA.add(4);
         collectionA.add(4);
         collectionA.add(4);
-        collectionB = new LinkedList<Long>();
+        collectionB = new LinkedList<>();
         collectionB.add(5L);
         collectionB.add(4L);
         collectionB.add(4L);
@@ -141,7 +140,7 @@
         collectionB.add(2L);
         collectionB.add(2L);
 
-        collectionC = new ArrayList<Integer>();
+        collectionC = new ArrayList<>();
         for (final Long l : collectionB) {
             collectionC.add(l.intValue());
         }
@@ -155,7 +154,7 @@
         iterableA2 = collectionA2;
         iterableB2 = collectionB2;
 
-        collectionD = new ArrayList<Integer>();
+        collectionD = new ArrayList<>();
         collectionD.add(1);
         collectionD.add(3);
         collectionD.add(3);
@@ -165,7 +164,7 @@
         collectionD.add(7);
         collectionD.add(10);
 
-        collectionE = new ArrayList<Integer>();
+        collectionE = new ArrayList<>();
         collectionE.add(2);
         collectionE.add(4);
         collectionE.add(4);
@@ -213,7 +212,7 @@
         assertEquals(0, CollectionUtils.cardinality(2L, iterableA2));
         assertEquals(0, CollectionUtils.cardinality(2, iterableB2));
 
-        final Set<String> set = new HashSet<String>();
+        final Set<String> set = new HashSet<>();
         set.add("A");
         set.add("C");
         set.add("E");
@@ -224,7 +223,7 @@
         assertEquals(0, CollectionUtils.cardinality("D", set));
         assertEquals(1, CollectionUtils.cardinality("E", set));
 
-        final Bag<String> bag = new HashBag<String>();
+        final Bag<String> bag = new HashBag<>();
         bag.add("A", 3);
         bag.add("C");
         bag.add("E");
@@ -239,7 +238,7 @@
     @Test
     @Deprecated
     public void cardinalityOfNull() {
-        final List<String> list = new ArrayList<String>();
+        final List<String> list = new ArrayList<>();
         assertEquals(0, CollectionUtils.cardinality(null, list));
         {
             final Map<String, Integer> freq = CollectionUtils.getCardinalityMap(list);
@@ -285,17 +284,17 @@
 
     @Test
     public void containsAll() {
-        final Collection<String> empty = new ArrayList<String>(0);
-        final Collection<String> one = new ArrayList<String>(1);
+        final Collection<String> empty = new ArrayList<>(0);
+        final Collection<String> one = new ArrayList<>(1);
         one.add("1");
-        final Collection<String> two = new ArrayList<String>(1);
+        final Collection<String> two = new ArrayList<>(1);
         two.add("2");
-        final Collection<String> three = new ArrayList<String>(1);
+        final Collection<String> three = new ArrayList<>(1);
         three.add("3");
-        final Collection<String> odds = new ArrayList<String>(2);
+        final Collection<String> odds = new ArrayList<>(2);
         odds.add("1");
         odds.add("3");
-        final Collection<String> multiples = new ArrayList<String>(3);
+        final Collection<String> multiples = new ArrayList<>(3);
         multiples.add("1");
         multiples.add("3");
         multiples.add("1");
@@ -320,15 +319,15 @@
     }
 
     @Test
-    public void containsAny() {
-        final Collection<String> empty = new ArrayList<String>(0);
-        final Collection<String> one = new ArrayList<String>(1);
+    public void containsAnyInCollection() {
+        final Collection<String> empty = new ArrayList<>(0);
+        final Collection<String> one = new ArrayList<>(1);
         one.add("1");
-        final Collection<String> two = new ArrayList<String>(1);
+        final Collection<String> two = new ArrayList<>(1);
         two.add("2");
-        final Collection<String> three = new ArrayList<String>(1);
+        final Collection<String> three = new ArrayList<>(1);
         three.add("3");
-        final Collection<String> odds = new ArrayList<String>(2);
+        final Collection<String> odds = new ArrayList<>(2);
         odds.add("1");
         odds.add("3");
 
@@ -349,6 +348,40 @@
     }
 
     @Test
+    public void containsAnyInArray() {
+        final Collection<String> empty = new ArrayList<>(0);
+        final String[] emptyArr = {};
+        final Collection<String> one = new ArrayList<>(1);
+        one.add("1");
+        final String[] oneArr = {"1"};
+        final Collection<String> two = new ArrayList<>(1);
+        two.add("2");
+        final String[] twoArr = {"2"};
+        final Collection<String> three = new ArrayList<>(1);
+        three.add("3");
+        final String[] threeArr = {"3"};
+        final Collection<String> odds = new ArrayList<>(2);
+        odds.add("1");
+        odds.add("3");
+        final String[] oddsArr = {"1", "3"};
+
+        assertTrue("containsAny({1},{1,3}) should return true.", CollectionUtils.containsAny(one, oddsArr));
+        assertTrue("containsAny({1,3},{1}) should return true.", CollectionUtils.containsAny(odds, oneArr));
+        assertTrue("containsAny({3},{1,3}) should return true.", CollectionUtils.containsAny(three, oddsArr));
+        assertTrue("containsAny({1,3},{3}) should return true.", CollectionUtils.containsAny(odds, threeArr));
+        assertTrue("containsAny({2},{2}) should return true.", CollectionUtils.containsAny(two, twoArr));
+        assertTrue("containsAny({1,3},{1,3}) should return true.", CollectionUtils.containsAny(odds, oddsArr));
+
+        assertTrue("containsAny({2},{1,3}) should return false.", !CollectionUtils.containsAny(two, oddsArr));
+        assertTrue("containsAny({1,3},{2}) should return false.", !CollectionUtils.containsAny(odds, twoArr));
+        assertTrue("containsAny({1},{3}) should return false.", !CollectionUtils.containsAny(one, threeArr));
+        assertTrue("containsAny({3},{1}) should return false.", !CollectionUtils.containsAny(three, oneArr));
+        assertTrue("containsAny({1,3},{}) should return false.", !CollectionUtils.containsAny(odds, emptyArr));
+        assertTrue("containsAny({},{1,3}) should return false.", !CollectionUtils.containsAny(empty, oddsArr));
+        assertTrue("containsAny({},{}) should return false.", !CollectionUtils.containsAny(empty, emptyArr));
+    }
+
+    @Test
     public void union() {
         final Collection<Integer> col = CollectionUtils.union(iterableA, iterableC);
         final Map<Integer, Integer> freq = CollectionUtils.getCardinalityMap(col);
@@ -473,7 +506,7 @@
 
     @Test
     public void testIsSubCollection2() {
-        final Collection<Integer> c = new ArrayList<Integer>();
+        final Collection<Integer> c = new ArrayList<>();
         assertTrue(CollectionUtils.isSubCollection(c, collectionA));
         assertTrue(!CollectionUtils.isSubCollection(collectionA, c));
         c.add(1);
@@ -525,7 +558,7 @@
 
     @Test
     public void testIsEqualCollectionReturnsFalse() {
-        final List<Integer> b = new ArrayList<Integer>(collectionA);
+        final List<Integer> b = new ArrayList<>(collectionA);
         // remove an extra '2', and add a 5.  This will increase the size of the cardinality
         b.remove(1);
         b.add(5);
@@ -535,8 +568,8 @@
 
     @Test
     public void testIsEqualCollection2() {
-        final Collection<String> a = new ArrayList<String>();
-        final Collection<String> b = new ArrayList<String>();
+        final Collection<String> a = new ArrayList<>();
+        final Collection<String> b = new ArrayList<>();
         assertTrue(CollectionUtils.isEqualCollection(a, b));
         assertTrue(CollectionUtils.isEqualCollection(b, a));
         a.add("1");
@@ -569,9 +602,8 @@
             public boolean equate(final Integer o1, final Integer o2) {
                 if (o1.intValue() % 2 == 0 ^ o2.intValue() % 2 == 0) {
                     return false;
-                } else {
-                    return true;
                 }
+                return true;
             }
 
             @Override
@@ -596,8 +628,8 @@
 
     @Test
     public void testIsProperSubCollection() {
-        final Collection<String> a = new ArrayList<String>();
-        final Collection<String> b = new ArrayList<String>();
+        final Collection<String> a = new ArrayList<>();
+        final Collection<String> b = new ArrayList<>();
         assertTrue(!CollectionUtils.isProperSubCollection(a, b));
         b.add("1");
         assertTrue(CollectionUtils.isProperSubCollection(a, b));
@@ -633,7 +665,7 @@
     @Deprecated
     public void forAllDoCollection() {
         final Closure<Collection<Integer>> testClosure = ClosureUtils.invokerClosure("clear");
-        final Collection<Collection<Integer>> col = new ArrayList<Collection<Integer>>();
+        final Collection<Collection<Integer>> col = new ArrayList<>();
         col.add(collectionA);
         col.add(collectionC);
         Closure<Collection<Integer>> resultClosure = CollectionUtils.forAllDo(col, testClosure);
@@ -653,7 +685,7 @@
     @Deprecated
     public void forAllDoIterator() {
         final Closure<Collection<Integer>> testClosure = ClosureUtils.invokerClosure("clear");
-        final Collection<Collection<Integer>> col = new ArrayList<Collection<Integer>>();
+        final Collection<Collection<Integer>> col = new ArrayList<>();
         col.add(collectionA);
         col.add(collectionC);
         Closure<Collection<Integer>> resultClosure = CollectionUtils.forAllDo(col.iterator(), testClosure);
@@ -673,7 +705,7 @@
     @Deprecated
     public void forAllDoFailure() {
         final Closure<String> testClosure = ClosureUtils.invokerClosure("clear");
-        final Collection<String> col = new ArrayList<String>();
+        final Collection<String> col = new ArrayList<>();
         col.add("x");
         CollectionUtils.forAllDo(col, testClosure);
     }
@@ -682,7 +714,7 @@
     @Deprecated
     public void forAllButLastDoCollection() {
         final Closure<List<? extends Number>> testClosure = ClosureUtils.invokerClosure("clear");
-        final Collection<List<? extends Number>> col = new ArrayList<List<? extends Number>>();
+        final Collection<List<? extends Number>> col = new ArrayList<>();
         col.add(collectionA);
         col.add(collectionB);
         List<? extends Number> lastElement = CollectionUtils.forAllButLastDo(col, testClosure);
@@ -699,21 +731,21 @@
         lastElement = CollectionUtils.forAllButLastDo(col, testClosure);
         assertNull(lastElement);
 
-        Collection<String> strings = Arrays.asList("a", "b", "c");
+        final Collection<String> strings = Arrays.asList("a", "b", "c");
         final StringBuffer result = new StringBuffer();
         result.append(CollectionUtils.forAllButLastDo(strings, new Closure<String>() {
             @Override
-            public void execute(String input) {
+            public void execute(final String input) {
                 result.append(input+";");
             }
         }));
         assertEquals("a;b;c", result.toString());
 
-        Collection<String> oneString = Arrays.asList("a");
+        final Collection<String> oneString = Arrays.asList("a");
         final StringBuffer resultOne = new StringBuffer();
         resultOne.append(CollectionUtils.forAllButLastDo(oneString, new Closure<String>() {
             @Override
-            public void execute(String input) {
+            public void execute(final String input) {
                 resultOne.append(input+";");
             }
         }));
@@ -726,10 +758,10 @@
     @Deprecated
     public void forAllButLastDoIterator() {
         final Closure<List<? extends Number>> testClosure = ClosureUtils.invokerClosure("clear");
-        final Collection<List<? extends Number>> col = new ArrayList<List<? extends Number>>();
+        final Collection<List<? extends Number>> col = new ArrayList<>();
         col.add(collectionA);
         col.add(collectionB);
-        List<? extends Number> lastElement = CollectionUtils.forAllButLastDo(col.iterator(), testClosure);
+        final List<? extends Number> lastElement = CollectionUtils.forAllButLastDo(col.iterator(), testClosure);
         assertSame(lastElement, collectionB);
         assertTrue(collectionA.isEmpty() && !collectionB.isEmpty());
 
@@ -740,11 +772,11 @@
     @Test
     public void getFromMap() {
         // Unordered map, entries exist
-        final Map<String, String> expected = new HashMap<String, String>();
+        final Map<String, String> expected = new HashMap<>();
         expected.put("zeroKey", "zero");
         expected.put("oneKey", "one");
 
-        final Map<String, String> found = new HashMap<String, String>();
+        final Map<String, String> found = new HashMap<>();
         Map.Entry<String, String> entry = CollectionUtils.get(expected, 0);
         found.put(entry.getKey(), entry.getValue());
         entry = CollectionUtils.get(expected, 1);
@@ -766,7 +798,7 @@
         }
 
         // Sorted map, entries exist, should respect order
-        final SortedMap<String, String> map = new TreeMap<String, String>();
+        final SortedMap<String, String> map = new TreeMap<>();
         map.put("zeroKey", "zero");
         map.put("oneKey", "one");
         Map.Entry<String, String> test = CollectionUtils.get(map, 1);
@@ -792,7 +824,7 @@
         assertEquals("zero", string);
         assertEquals("one", CollectionUtils.get(list, 1));
         // list, non-existent entry -- IndexOutOfBoundsException
-        CollectionUtils.get(new ArrayList<Object>(), 2);
+        CollectionUtils.get(new ArrayList<>(), 2);
     }
 
     @Test
@@ -818,7 +850,7 @@
     @Deprecated
     public void getFromEnumeration() throws Exception {
         // Enumeration, entry exists
-        final Vector<String> vector = new Vector<String>();
+        final Vector<String> vector = new Vector<>();
         vector.addElement("zero");
         vector.addElement("one");
         Enumeration<String> en = vector.elements();
@@ -840,7 +872,7 @@
     @Deprecated
     public void getFromIterable() throws Exception {
         // Collection, entry exists
-        final Bag<String> bag = new HashBag<String>();
+        final Bag<String> bag = new HashBag<>();
         bag.add("element", 1);
         assertEquals("element", CollectionUtils.get(bag, 0));
 
@@ -888,7 +920,7 @@
     public void testSize_List() {
         List<String> list = null;
         assertEquals(0, CollectionUtils.size(list));
-        list = new ArrayList<String>();
+        list = new ArrayList<>();
         assertEquals(0, CollectionUtils.size(list));
         list.add("a");
         assertEquals(1, CollectionUtils.size(list));
@@ -898,7 +930,7 @@
 
     @Test
     public void testSize_Map() {
-        final Map<String, String> map = new HashMap<String, String>();
+        final Map<String, String> map = new HashMap<>();
         assertEquals(0, CollectionUtils.size(map));
         map.put("1", "a");
         assertEquals(1, CollectionUtils.size(map));
@@ -934,7 +966,7 @@
 
     @Test
     public void testSize_Enumeration() {
-        final Vector<String> list = new Vector<String>();
+        final Vector<String> list = new Vector<>();
         assertEquals(0, CollectionUtils.size(list.elements()));
         list.add("a");
         assertEquals(1, CollectionUtils.size(list.elements()));
@@ -944,7 +976,7 @@
 
     @Test
     public void testSize_Iterator() {
-        final List<String> list = new ArrayList<String>();
+        final List<String> list = new ArrayList<>();
         assertEquals(0, CollectionUtils.size(list.iterator()));
         list.add("a");
         assertEquals(1, CollectionUtils.size(list.iterator()));
@@ -965,7 +997,7 @@
 
     @Test
     public void testSizeIsEmpty_List() {
-        final List<String> list = new ArrayList<String>();
+        final List<String> list = new ArrayList<>();
         assertEquals(true, CollectionUtils.sizeIsEmpty(list));
         list.add("a");
         assertEquals(false, CollectionUtils.sizeIsEmpty(list));
@@ -973,7 +1005,7 @@
 
     @Test
     public void testSizeIsEmpty_Map() {
-        final Map<String, String> map = new HashMap<String, String>();
+        final Map<String, String> map = new HashMap<>();
         assertEquals(true, CollectionUtils.sizeIsEmpty(map));
         map.put("1", "a");
         assertEquals(false, CollectionUtils.sizeIsEmpty(map));
@@ -1007,7 +1039,7 @@
 
     @Test
     public void testSizeIsEmpty_Enumeration() {
-        final Vector<String> list = new Vector<String>();
+        final Vector<String> list = new Vector<>();
         assertEquals(true, CollectionUtils.sizeIsEmpty(list.elements()));
         list.add("a");
         assertEquals(false, CollectionUtils.sizeIsEmpty(list.elements()));
@@ -1018,7 +1050,7 @@
 
     @Test
     public void testSizeIsEmpty_Iterator() {
-        final List<String> list = new ArrayList<String>();
+        final List<String> list = new ArrayList<>();
         assertEquals(true, CollectionUtils.sizeIsEmpty(list.iterator()));
         list.add("a");
         assertEquals(false, CollectionUtils.sizeIsEmpty(list.iterator()));
@@ -1039,13 +1071,13 @@
     // -----------------------------------------------------------------------
     @Test
     public void testIsEmptyWithEmptyCollection() {
-        final Collection<Object> coll = new ArrayList<Object>();
+        final Collection<Object> coll = new ArrayList<>();
         assertEquals(true, CollectionUtils.isEmpty(coll));
     }
 
     @Test
     public void testIsEmptyWithNonEmptyCollection() {
-        final Collection<String> coll = new ArrayList<String>();
+        final Collection<String> coll = new ArrayList<>();
         coll.add("item");
         assertEquals(false, CollectionUtils.isEmpty(coll));
     }
@@ -1058,13 +1090,13 @@
 
     @Test
     public void testIsNotEmptyWithEmptyCollection() {
-        final Collection<Object> coll = new ArrayList<Object>();
+        final Collection<Object> coll = new ArrayList<>();
         assertEquals(false, CollectionUtils.isNotEmpty(coll));
     }
 
     @Test
     public void testIsNotEmptyWithNonEmptyCollection() {
-        final Collection<String> coll = new ArrayList<String>();
+        final Collection<String> coll = new ArrayList<>();
         coll.add("item");
         assertEquals(true, CollectionUtils.isNotEmpty(coll));
     }
@@ -1086,7 +1118,7 @@
 //Up to here
     @Test
     public void filter() {
-        final List<Integer> ints = new ArrayList<Integer>();
+        final List<Integer> ints = new ArrayList<>();
         ints.add(1);
         ints.add(2);
         ints.add(3);
@@ -1110,7 +1142,7 @@
 
     @Test
     public void filterInverse() {
-        final List<Integer> ints = new ArrayList<Integer>();
+        final List<Integer> ints = new ArrayList<>();
         ints.add(1);
         ints.add(2);
         ints.add(3);
@@ -1146,7 +1178,7 @@
     @Test
     @Deprecated
     public void exists() {
-        final List<Integer> list = new ArrayList<Integer>();
+        final List<Integer> list = new ArrayList<>();
         assertFalse(CollectionUtils.exists(null, null));
         assertFalse(CollectionUtils.exists(list, null));
         assertFalse(CollectionUtils.exists(null, EQUALS_TWO));
@@ -1162,7 +1194,7 @@
 
     @Test
     public void select() {
-        final List<Integer> list = new ArrayList<Integer>();
+        final List<Integer> list = new ArrayList<>();
         list.add(1);
         list.add(2);
         list.add(3);
@@ -1179,25 +1211,25 @@
 
     @Test
     public void selectWithOutputCollections() {
-        List<Integer> input = new ArrayList<Integer>();
+        final List<Integer> input = new ArrayList<>();
         input.add(1);
         input.add(2);
         input.add(3);
         input.add(4);
-        
-        List<Integer> output = new ArrayList<Integer>();
-        List<Integer> rejected = new ArrayList<Integer>();
+
+        final List<Integer> output = new ArrayList<>();
+        final List<Integer> rejected = new ArrayList<>();
 
         CollectionUtils.select(input, EQUALS_TWO, output, rejected);
 
         // output contains 2
         assertEquals(1, output.size());
         assertEquals(2, CollectionUtils.extractSingleton(output).intValue());
-        
+
         // rejected contains 1, 3, and 4
-        Integer[] expected = {1, 3, 4};
+        final Integer[] expected = {1, 3, 4};
         Assert.assertArrayEquals(expected, rejected.toArray());
-        
+
         output.clear();
         rejected.clear();
         CollectionUtils.select((List<Integer>) null, EQUALS_TWO, output, rejected);
@@ -1207,7 +1239,7 @@
 
     @Test
     public void selectRejected() {
-        final List<Long> list = new ArrayList<Long>();
+        final List<Long> list = new ArrayList<>();
         list.add(1L);
         list.add(2L);
         list.add(3L);
@@ -1273,7 +1305,7 @@
 
     @Test
     public void transform1() {
-        List<Number> list = new ArrayList<Number>();
+        List<Number> list = new ArrayList<>();
         list.add(1L);
         list.add(2L);
         list.add(3L);
@@ -1283,7 +1315,7 @@
         assertEquals(2, list.get(1));
         assertEquals(3, list.get(2));
 
-        list = new ArrayList<Number>();
+        list = new ArrayList<>();
         list.add(1L);
         list.add(2L);
         list.add(3L);
@@ -1297,7 +1329,7 @@
 
     @Test
     public void transform2() {
-        final Set<Number> set = new HashSet<Number>();
+        final Set<Number> set = new HashSet<>();
         set.add(1L);
         set.add(2L);
         set.add(3L);
@@ -1314,7 +1346,7 @@
     // -----------------------------------------------------------------------
     @Test
     public void addIgnoreNull() {
-        final Set<String> set = new HashSet<String>();
+        final Set<String> set = new HashSet<>();
         set.add("1");
         set.add("2");
         set.add("3");
@@ -1331,7 +1363,7 @@
     @Test
     public void predicatedCollection() {
         final Predicate<Object> predicate = PredicateUtils.instanceofPredicate(Integer.class);
-        Collection<Number> collection = CollectionUtils.predicatedCollection(new ArrayList<Number>(), predicate);
+        final Collection<Number> collection = CollectionUtils.predicatedCollection(new ArrayList<Number>(), predicate);
         assertTrue("returned object should be a PredicatedCollection", collection instanceof PredicatedCollection);
         try {
             CollectionUtils.predicatedCollection(new ArrayList<Number>(), null);
@@ -1349,7 +1381,7 @@
 
     @Test
     public void isFull() {
-        final Set<String> set = new HashSet<String>();
+        final Set<String> set = new HashSet<>();
         set.add("1");
         set.add("2");
         set.add("3");
@@ -1360,7 +1392,7 @@
         }
         assertFalse(CollectionUtils.isFull(set));
 
-        final CircularFifoQueue<String> buf = new CircularFifoQueue<String>(set);
+        final CircularFifoQueue<String> buf = new CircularFifoQueue<>(set);
         assertEquals(false, CollectionUtils.isFull(buf));
         buf.remove("2");
         assertFalse(CollectionUtils.isFull(buf));
@@ -1376,7 +1408,7 @@
 
     @Test
     public void maxSize() {
-        final Set<String> set = new HashSet<String>();
+        final Set<String> set = new HashSet<>();
         set.add("1");
         set.add("2");
         set.add("3");
@@ -1387,7 +1419,7 @@
         }
         assertEquals(-1, CollectionUtils.maxSize(set));
 
-        final Queue<String> buf = new CircularFifoQueue<String>(set);
+        final Queue<String> buf = new CircularFifoQueue<>(set);
         assertEquals(3, CollectionUtils.maxSize(buf));
         buf.remove("2");
         assertEquals(3, CollectionUtils.maxSize(buf));
@@ -1409,8 +1441,8 @@
         assertTrue(elta != eltb);
 
         // Let cola and colb be collections...
-        final Collection<Number> cola = new ArrayList<Number>();
-        final Collection<Integer> colb = new ArrayList<Integer>();
+        final Collection<Number> cola = new ArrayList<>();
+        final Collection<Integer> colb = new ArrayList<>();
 
         // ...which contain elta and eltb,
         // respectively.
@@ -1440,11 +1472,11 @@
     //Up to here
     @Test
     public void testRetainAll() {
-        final List<String> base = new ArrayList<String>();
+        final List<String> base = new ArrayList<>();
         base.add("A");
         base.add("B");
         base.add("C");
-        final List<Object> sub = new ArrayList<Object>();
+        final List<Object> sub = new ArrayList<>();
         sub.add("A");
         sub.add("C");
         sub.add("X");
@@ -1472,11 +1504,11 @@
 
     @Test
     public void testRemoveAll() {
-        final List<String> base = new ArrayList<String>();
+        final List<String> base = new ArrayList<>();
         base.add("A");
         base.add("B");
         base.add("C");
-        final List<String> sub = new ArrayList<String>();
+        final List<String> sub = new ArrayList<>();
         sub.add("A");
         sub.add("C");
         sub.add("X");
@@ -1506,10 +1538,10 @@
     @Test
     public void testTransformedCollection() {
         final Transformer<Object, Object> transformer = TransformerUtils.nopTransformer();
-        Collection<Object> collection = CollectionUtils.transformingCollection(new ArrayList<Object>(), transformer);
+        final Collection<Object> collection = CollectionUtils.transformingCollection(new ArrayList<>(), transformer);
         assertTrue("returned object should be a TransformedCollection", collection instanceof TransformedCollection);
         try {
-            CollectionUtils.transformingCollection(new ArrayList<Object>(), null);
+            CollectionUtils.transformingCollection(new ArrayList<>(), null);
             fail("Expecting NullPointerException for null transformer.");
         } catch (final NullPointerException ex) {
             // expected
@@ -1524,7 +1556,7 @@
 
     @Test
     public void testTransformedCollection_2() {
-        final List<Object> list = new ArrayList<Object>();
+        final List<Object> list = new ArrayList<>();
         list.add("1");
         list.add("2");
         list.add("3");
@@ -1537,7 +1569,7 @@
     @Test
     @Deprecated
     public void testSynchronizedCollection() {
-        Collection<Object> col = CollectionUtils.synchronizedCollection(new ArrayList<Object>());
+        final Collection<Object> col = CollectionUtils.synchronizedCollection(new ArrayList<>());
         assertTrue("Returned object should be a SynchronizedCollection.", col instanceof SynchronizedCollection);
         try {
             CollectionUtils.synchronizedCollection(null);
@@ -1550,7 +1582,7 @@
     @Test
     @Deprecated
     public void testUnmodifiableCollection() {
-        Collection<Object> col = CollectionUtils.unmodifiableCollection(new ArrayList<Object>());
+        final Collection<Object> col = CollectionUtils.unmodifiableCollection(new ArrayList<>());
         assertTrue("Returned object should be a UnmodifiableCollection.", col instanceof UnmodifiableCollection);
         try {
             CollectionUtils.unmodifiableCollection(null);
@@ -1569,7 +1601,7 @@
     @Test
     public void emptyIfNull() {
         assertTrue(CollectionUtils.emptyIfNull(null).isEmpty());
-        final Collection<Object> collection = new ArrayList<Object>();
+        final Collection<Object> collection = new ArrayList<>();
         assertSame(collection, CollectionUtils.emptyIfNull(collection));
     }
 
@@ -1617,7 +1649,7 @@
 
     @Test
     public void addAllForEnumeration() {
-        final Hashtable<Integer, Integer> h = new Hashtable<Integer, Integer>();
+        final Hashtable<Integer, Integer> h = new Hashtable<>();
         h.put(5, 5);
         final Enumeration<? extends Integer> enumeration = h.keys();
         CollectionUtils.addAll(collectionA, enumeration);
@@ -1664,7 +1696,7 @@
 
     @Test
     public void getEnumeration() {
-        final Vector<Integer> vectorA = new Vector<Integer>(collectionA);
+        final Vector<Integer> vectorA = new Vector<>(collectionA);
         final Enumeration<Integer> e = vectorA.elements();
         assertEquals(Integer.valueOf(2), CollectionUtils.get(e, 2));
         assertTrue(e.hasMoreElements());
@@ -1690,7 +1722,7 @@
             fail("expected NullPointerException from extractSingleton(null)");
         } catch (final NullPointerException e) {
         }
-        coll = new ArrayList<String>();
+        coll = new ArrayList<>();
         try {
             CollectionUtils.extractSingleton(coll);
             fail("expected IllegalArgumentException from extractSingleton(empty)");
@@ -1736,7 +1768,7 @@
         List<Integer> result2 = CollectionUtils.collate(collectionE, collectionD);
         assertEquals("Merge two lists 1", result1, result2);
 
-        List<Integer> combinedList = new ArrayList<Integer>();
+        final List<Integer> combinedList = new ArrayList<>();
         combinedList.addAll(collectionD);
         combinedList.addAll(collectionE);
         Collections.sort(combinedList);
@@ -1761,14 +1793,14 @@
 
     @Test
     public void testCollateIgnoreDuplicates() {
-        List<Integer> result1 = CollectionUtils.collate(collectionD, collectionE, false);
-        List<Integer> result2 = CollectionUtils.collate(collectionE, collectionD, false);
+        final List<Integer> result1 = CollectionUtils.collate(collectionD, collectionE, false);
+        final List<Integer> result2 = CollectionUtils.collate(collectionE, collectionD, false);
         assertEquals("Merge two lists 1 - ignore duplicates", result1, result2);
 
-        Set<Integer> combinedSet = new HashSet<Integer>();
+        final Set<Integer> combinedSet = new HashSet<>();
         combinedSet.addAll(collectionD);
         combinedSet.addAll(collectionE);
-        List<Integer> combinedList = new ArrayList<Integer>(combinedSet);
+        final List<Integer> combinedList = new ArrayList<>(combinedSet);
         Collections.sort(combinedList);
 
         assertEquals("Merge two lists 2 - ignore duplicates", combinedList, result2);
@@ -1781,11 +1813,11 @@
 
     @Test
     public void testPermutations() {
-        List<Integer> sample = collectionA.subList(0, 5);
-        Collection<List<Integer>> permutations = CollectionUtils.permutations(sample);
+        final List<Integer> sample = collectionA.subList(0, 5);
+        final Collection<List<Integer>> permutations = CollectionUtils.permutations(sample);
 
         // result size = n!
-        int collSize = sample.size();
+        final int collSize = sample.size();
         int factorial = 1;
         for (int i = 1; i <= collSize; i++) {
             factorial *= i;
@@ -1799,17 +1831,17 @@
         assertFalse(CollectionUtils.matchesAll(null, null));
         assertFalse(CollectionUtils.matchesAll(collectionA, null));
 
-        Predicate<Integer> lessThanFive = new Predicate<Integer>() {
+        final Predicate<Integer> lessThanFive = new Predicate<Integer>() {
             @Override
-            public boolean evaluate(Integer object) {
+            public boolean evaluate(final Integer object) {
                 return object < 5;
             }
         };
         assertTrue(CollectionUtils.matchesAll(collectionA, lessThanFive));
 
-        Predicate<Integer> lessThanFour = new Predicate<Integer>() {
+        final Predicate<Integer> lessThanFour = new Predicate<Integer>() {
             @Override
-            public boolean evaluate(Integer object) {
+            public boolean evaluate(final Integer object) {
                 return object < 4;
             }
         };
@@ -1821,12 +1853,12 @@
 
     @Test
     public void testRemoveAllWithEquator() {
-        final List<String> base = new ArrayList<String>();
+        final List<String> base = new ArrayList<>();
         base.add("AC");
         base.add("BB");
         base.add("CA");
 
-        final List<String> remove = new ArrayList<String>();
+        final List<String> remove = new ArrayList<>();
         remove.add("AA");
         remove.add("CX");
         remove.add("XZ");
@@ -1835,12 +1867,12 @@
         final Collection<String> result = CollectionUtils.removeAll(base, remove, new Equator<String>() {
 
             @Override
-            public boolean equate(String o1, String o2) {
+            public boolean equate(final String o1, final String o2) {
                 return o1.charAt(1) == o2.charAt(1);
             }
 
             @Override
-            public int hash(String o) {
+            public int hash(final String o) {
                 return o.charAt(1);
             }
         });
@@ -1873,12 +1905,12 @@
 
     @Test
     public void testRetainAllWithEquator() {
-        final List<String> base = new ArrayList<String>();
+        final List<String> base = new ArrayList<>();
         base.add("AC");
         base.add("BB");
         base.add("CA");
 
-        final List<String> retain = new ArrayList<String>();
+        final List<String> retain = new ArrayList<>();
         retain.add("AA");
         retain.add("CX");
         retain.add("XZ");
@@ -1887,12 +1919,12 @@
         final Collection<String> result = CollectionUtils.retainAll(base, retain, new Equator<String>() {
 
             @Override
-            public boolean equate(String o1, String o2) {
+            public boolean equate(final String o1, final String o2) {
                 return o1.charAt(1) == o2.charAt(1);
             }
 
             @Override
-            public int hash(String o) {
+            public int hash(final String o) {
                 return o.charAt(1);
             }
         });
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/comparators/AbstractComparatorTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/comparators/AbstractComparatorTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/comparators/AbstractComparatorTest.java	2013-04-30 14:27:35.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/comparators/AbstractComparatorTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -106,10 +106,10 @@
      */
     @Test
     public void testEmptyListSort() {
-        final List<T> list = new LinkedList<T>();
+        final List<T> list = new LinkedList<>();
         sortObjects(list, makeObject());
 
-        final List<T> list2 = new LinkedList<T>();
+        final List<T> list2 = new LinkedList<>();
 
         assertTrue("Comparator cannot sort empty lists", list2.equals(list));
     }
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/comparators/AbstractNullComparatorTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/comparators/AbstractNullComparatorTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/comparators/AbstractNullComparatorTest.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/comparators/AbstractNullComparatorTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -26,7 +26,6 @@
 /**
  * Test the NullComparator.
  *
- * @version $Id: AbstractNullComparatorTest.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 public abstract class AbstractNullComparatorTest extends AbstractComparatorTest<Integer> {
 
@@ -52,12 +51,12 @@
 
         @Override
         public Comparator<Integer> makeObject() {
-            return new NullComparator<Integer>();
+            return new NullComparator<>();
         }
 
         @Override
         public List<Integer> getComparableObjectsOrdered() {
-            final List<Integer> list = new LinkedList<Integer>();
+            final List<Integer> list = new LinkedList<>();
             list.add(Integer.valueOf(1));
             list.add(Integer.valueOf(2));
             list.add(Integer.valueOf(3));
@@ -94,12 +93,12 @@
 
         @Override
         public Comparator<Integer> makeObject() {
-            return new NullComparator<Integer>(false);
+            return new NullComparator<>(false);
         }
 
         @Override
         public List<Integer> getComparableObjectsOrdered() {
-            final List<Integer> list = new LinkedList<Integer>();
+            final List<Integer> list = new LinkedList<>();
             list.add(null);
             list.add(Integer.valueOf(1));
             list.add(Integer.valueOf(2));
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/comparators/BooleanComparatorTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/comparators/BooleanComparatorTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/comparators/BooleanComparatorTest.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/comparators/BooleanComparatorTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -25,7 +25,6 @@
 /**
  * Tests for {@link BooleanComparator}.
  *
- * @version $Id: BooleanComparatorTest.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 @SuppressWarnings("boxing")
 public class BooleanComparatorTest extends AbstractComparatorTest<Boolean> {
@@ -47,7 +46,7 @@
 
     @Override
     public List<Boolean> getComparableObjectsOrdered() {
-        final List<Boolean> list = new ArrayList<Boolean>();
+        final List<Boolean> list = new ArrayList<>();
         list.add(new Boolean(false));
         list.add(Boolean.FALSE);
         list.add(new Boolean(false));
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/comparators/ComparableComparatorTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/comparators/ComparableComparatorTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/comparators/ComparableComparatorTest.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/comparators/ComparableComparatorTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -23,7 +23,6 @@
 /**
  * Tests for ComparableComparator.
  *
- * @version $Id: ComparableComparatorTest.java 1540695 2013-11-11 13:01:13Z ebourg $
  *
  */
 @SuppressWarnings("boxing")
@@ -35,12 +34,12 @@
 
     @Override
     public Comparator<Integer> makeObject() {
-        return new ComparableComparator<Integer>();
+        return new ComparableComparator<>();
     }
 
     @Override
     public List<Integer> getComparableObjectsOrdered() {
-        final List<Integer> list = new LinkedList<Integer>();
+        final List<Integer> list = new LinkedList<>();
         list.add(1);
         list.add(2);
         list.add(3);
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/comparators/ComparatorChainTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/comparators/ComparatorChainTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/comparators/ComparatorChainTest.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/comparators/ComparatorChainTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -26,7 +26,6 @@
 /**
  * Tests for ComparatorChain.
  *
- * @version $Id: ComparatorChainTest.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 public class ComparatorChainTest extends AbstractComparatorTest<ComparatorChainTest.PseudoRow> {
 
@@ -36,7 +35,7 @@
 
     @Override
     public Comparator<PseudoRow> makeObject() {
-        final ComparatorChain<PseudoRow> chain = new ComparatorChain<PseudoRow>(new ColumnComparator(0));
+        final ComparatorChain<PseudoRow> chain = new ComparatorChain<>(new ColumnComparator(0));
         chain.addComparator(new ColumnComparator(1), true); // reverse the second column
         chain.addComparator(new ColumnComparator(2), false);
         return chain;
@@ -53,7 +52,7 @@
 
     @Test
     public void testNoopComparatorChain() {
-        final ComparatorChain<Integer> chain = new ComparatorChain<Integer>();
+        final ComparatorChain<Integer> chain = new ComparatorChain<>();
         final Integer i1 = Integer.valueOf(4);
         final Integer i2 = Integer.valueOf(6);
         chain.addComparator(new ComparableComparator<Integer>());
@@ -64,7 +63,7 @@
 
     @Test
     public void testBadNoopComparatorChain() {
-        final ComparatorChain<Integer> chain = new ComparatorChain<Integer>();
+        final ComparatorChain<Integer> chain = new ComparatorChain<>();
         final Integer i1 = Integer.valueOf(4);
         final Integer i2 = Integer.valueOf(6);
         try {
@@ -76,9 +75,9 @@
 
     @Test
     public void testListComparatorChain() {
-        final List<Comparator<Integer>> list = new LinkedList<Comparator<Integer>>();
+        final List<Comparator<Integer>> list = new LinkedList<>();
         list.add(new ComparableComparator<Integer>());
-        final ComparatorChain<Integer> chain = new ComparatorChain<Integer>(list);
+        final ComparatorChain<Integer> chain = new ComparatorChain<>(list);
         final Integer i1 = Integer.valueOf(4);
         final Integer i2 = Integer.valueOf(6);
 
@@ -88,8 +87,8 @@
 
     @Test
     public void testBadListComparatorChain() {
-        final List<Comparator<Integer>> list = new LinkedList<Comparator<Integer>>();
-        final ComparatorChain<Integer> chain = new ComparatorChain<Integer>(list);
+        final List<Comparator<Integer>> list = new LinkedList<>();
+        final ComparatorChain<Integer> chain = new ComparatorChain<>(list);
         final Integer i1 = Integer.valueOf(4);
         final Integer i2 = Integer.valueOf(6);
         try {
@@ -103,8 +102,9 @@
     public void testComparatorChainOnMinvaluedCompatator() {
         // -1 * Integer.MIN_VALUE is less than 0,
         // test that ComparatorChain handles this edge case correctly
-        final ComparatorChain<Integer> chain = new ComparatorChain<Integer>();
+        final ComparatorChain<Integer> chain = new ComparatorChain<>();
         chain.addComparator(new Comparator<Integer>() {
+            @Override
             public int compare(final Integer a, final Integer b) {
                 final int result = a.compareTo(b);
                 if (result < 0) {
@@ -124,7 +124,7 @@
 
     @Override
     public List<PseudoRow> getComparableObjectsOrdered() {
-        final List<PseudoRow> list = new LinkedList<PseudoRow>();
+        final List<PseudoRow> list = new LinkedList<>();
         // this is the correct order assuming a
         // "0th forward, 1st reverse, 2nd forward" sort
         list.add(new PseudoRow(1, 2, 3));
@@ -201,6 +201,7 @@
             this.colIndex = colIndex;
         }
 
+        @Override
         public int compare(final PseudoRow o1, final PseudoRow o2) {
 
             final int col1 = o1.getColumn(colIndex);
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/comparators/FixedOrderComparatorTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/comparators/FixedOrderComparatorTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/comparators/FixedOrderComparatorTest.java	2013-11-11 21:58:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/comparators/FixedOrderComparatorTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -27,7 +27,6 @@
 /**
  * Test class for FixedOrderComparator.
  *
- * @version $Id: FixedOrderComparatorTest.java 1540860 2013-11-11 21:58:27Z ebourg $
  */
 public class FixedOrderComparatorTest extends AbstractComparatorTest<String> {
 
@@ -61,7 +60,7 @@
 
     @Override
     public Comparator<String> makeObject() {
-        final FixedOrderComparator<String> comparator = new FixedOrderComparator<String>(topCities);
+        final FixedOrderComparator<String> comparator = new FixedOrderComparator<>(topCities);
         return comparator;
     }
 
@@ -88,7 +87,7 @@
      */
     @Test
     public void testConstructorPlusAdd() {
-        final FixedOrderComparator<String> comparator = new FixedOrderComparator<String>();
+        final FixedOrderComparator<String> comparator = new FixedOrderComparator<>();
         for (final String topCitie : topCities) {
             comparator.add(topCitie);
         }
@@ -103,7 +102,7 @@
     public void testArrayConstructor() {
         final String[] keys = topCities.clone();
         final String[] topCitiesForTest = topCities.clone();
-        final FixedOrderComparator<String> comparator = new FixedOrderComparator<String>(topCitiesForTest);
+        final FixedOrderComparator<String> comparator = new FixedOrderComparator<>(topCitiesForTest);
         assertComparatorYieldsOrder(keys, comparator);
         // test that changing input after constructor has no effect
         topCitiesForTest[0] = "Brighton";
@@ -116,8 +115,8 @@
     @Test
     public void testListConstructor() {
         final String[] keys = topCities.clone();
-        final List<String> topCitiesForTest = new LinkedList<String>(Arrays.asList(topCities));
-        final FixedOrderComparator<String> comparator = new FixedOrderComparator<String>(topCitiesForTest);
+        final List<String> topCitiesForTest = new LinkedList<>(Arrays.asList(topCities));
+        final FixedOrderComparator<String> comparator = new FixedOrderComparator<>(topCitiesForTest);
         assertComparatorYieldsOrder(keys, comparator);
         // test that changing input after constructor has no effect
         topCitiesForTest.set(0, "Brighton");
@@ -129,7 +128,7 @@
      */
     @Test
     public void testAddAsEqual() {
-        final FixedOrderComparator<String> comparator = new FixedOrderComparator<String>(topCities);
+        final FixedOrderComparator<String> comparator = new FixedOrderComparator<>(topCities);
         comparator.addAsEqual("New York", "Minneapolis");
         assertEquals(0, comparator.compare("New York", "Minneapolis"));
         assertEquals(-1, comparator.compare("Tokyo", "Minneapolis"));
@@ -141,7 +140,7 @@
      */
     @Test
     public void testLock() {
-        final FixedOrderComparator<String> comparator = new FixedOrderComparator<String>(topCities);
+        final FixedOrderComparator<String> comparator = new FixedOrderComparator<>(topCities);
         assertEquals(false, comparator.isLocked());
         comparator.compare("New York", "Tokyo");
         assertEquals(true, comparator.isLocked());
@@ -162,7 +161,7 @@
 
     @Test
     public void testUnknownObjectBehavior() {
-        FixedOrderComparator<String> comparator = new FixedOrderComparator<String>(topCities);
+        FixedOrderComparator<String> comparator = new FixedOrderComparator<>(topCities);
         try {
             comparator.compare("New York", "Minneapolis");
             fail("Should have thrown a IllegalArgumentException");
@@ -177,10 +176,10 @@
         }
         assertEquals(FixedOrderComparator.UnknownObjectBehavior.EXCEPTION, comparator.getUnknownObjectBehavior());
 
-        comparator = new FixedOrderComparator<String>(topCities);
+        comparator = new FixedOrderComparator<>(topCities);
         comparator.setUnknownObjectBehavior(FixedOrderComparator.UnknownObjectBehavior.BEFORE);
         assertEquals(FixedOrderComparator.UnknownObjectBehavior.BEFORE, comparator.getUnknownObjectBehavior());
-        LinkedList<String> keys = new LinkedList<String>(Arrays.asList(topCities));
+        LinkedList<String> keys = new LinkedList<>(Arrays.asList(topCities));
         keys.addFirst("Minneapolis");
         assertComparatorYieldsOrder(keys.toArray(new String[0]), comparator);
 
@@ -188,9 +187,9 @@
         assertEquals( 1, comparator.compare("New York", "Minneapolis"));
         assertEquals( 0, comparator.compare("Minneapolis", "St Paul"));
 
-        comparator = new FixedOrderComparator<String>(topCities);
+        comparator = new FixedOrderComparator<>(topCities);
         comparator.setUnknownObjectBehavior(FixedOrderComparator.UnknownObjectBehavior.AFTER);
-        keys = new LinkedList<String>(Arrays.asList(topCities));
+        keys = new LinkedList<>(Arrays.asList(topCities));
         keys.add("Minneapolis");
         assertComparatorYieldsOrder(keys.toArray(new String[0]), comparator);
 
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/comparators/ReverseComparatorTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/comparators/ReverseComparatorTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/comparators/ReverseComparatorTest.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/comparators/ReverseComparatorTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -30,7 +30,6 @@
 /**
  * Tests for ReverseComparator.
  *
- * @version $Id: ReverseComparatorTest.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 public class ReverseComparatorTest extends AbstractComparatorTest<Integer> {
 
@@ -50,7 +49,7 @@
      */
     @Override
     public Comparator<Integer> makeObject() {
-        return new ReverseComparator<Integer>(Collections.<Integer>reverseOrder());
+        return new ReverseComparator<>(Collections.<Integer>reverseOrder());
     }
 
     @Override
@@ -64,7 +63,7 @@
 
     @Override
     public List<Integer> getComparableObjectsOrdered() {
-        final List<Integer> list = new LinkedList<Integer>();
+        final List<Integer> list = new LinkedList<>();
         list.add(Integer.valueOf(1));
         list.add(Integer.valueOf(2));
         list.add(Integer.valueOf(3));
@@ -81,7 +80,7 @@
     @Override
     @Test
     public void testSerializeDeserializeThenCompare() throws Exception {
-        final Comparator<?> comp = new ReverseComparator<String>(new ComparableComparator<String>());
+        final Comparator<?> comp = new ReverseComparator<>(new ComparableComparator<String>());
 
         final ByteArrayOutputStream buffer = new ByteArrayOutputStream();
         final ObjectOutputStream out = new ObjectOutputStream(buffer);
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/comparators/TransformingComparatorTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/comparators/TransformingComparatorTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/comparators/TransformingComparatorTest.java	2014-04-10 21:55:29.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/comparators/TransformingComparatorTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -27,7 +27,6 @@
 /**
  * Test class for TransformingComparator.
  *
- * @version $Id: TransformingComparatorTest.java 1586477 2014-04-10 21:55:29Z tn $
  */
 public class TransformingComparatorTest extends AbstractComparatorTest<Integer> {
 
@@ -45,14 +44,14 @@
 
     @Override
     public Comparator<Integer> makeObject() {
-       final Comparator<String> decorated = new ComparableComparator<String>();
+       final Comparator<String> decorated = new ComparableComparator<>();
        return ComparatorUtils.transformedComparator(decorated, TransformerUtils.<Integer>stringValueTransformer());
     }
 
     @Override
     @SuppressWarnings("boxing") // OK in test code
     public List<Integer> getComparableObjectsOrdered() {
-        final List<Integer> list = new LinkedList<Integer>();
+        final List<Integer> list = new LinkedList<>();
         list.add(1);
         list.add(2);
         list.add(3);
@@ -62,9 +61,9 @@
     }
 
     public void testEquals() {
-        Transformer<String, String> t1 = TransformerUtils.nopTransformer();
-        TransformingComparator<String, String> comp1 = new TransformingComparator<String, String>(t1);
-        TransformingComparator<String, String> comp2 = new TransformingComparator<String, String>(t1, comp1);
+        final Transformer<String, String> t1 = TransformerUtils.nopTransformer();
+        final TransformingComparator<String, String> comp1 = new TransformingComparator<>(t1);
+        final TransformingComparator<String, String> comp2 = new TransformingComparator<>(t1, comp1);
 
         // Checks the contract: equals-hashcode on comp1 and comp2
         assertTrue("Contract failed: equals-hashcode",
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/ComparatorUtilsTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/ComparatorUtilsTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/ComparatorUtilsTest.java	2015-06-08 20:05:37.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/ComparatorUtilsTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -27,7 +27,6 @@
 /**
  * Tests ComparatorUtils.
  *
- * @version $Id: ComparatorUtilsTest.java 1684262 2015-06-08 20:05:37Z tn $
  */
 public class ComparatorUtilsTest {
 
@@ -47,7 +46,7 @@
     @Test
     public void chainedComparator() {
         // simple test: chain 2 natural comparators
-        Comparator<Integer> comp = ComparatorUtils.chainedComparator(ComparatorUtils.<Integer>naturalComparator(),
+        final Comparator<Integer> comp = ComparatorUtils.chainedComparator(ComparatorUtils.<Integer>naturalComparator(),
                                                                      ComparatorUtils.<Integer>naturalComparator());
         assertTrue(comp.compare(1, 2) < 0);
         assertTrue(comp.compare(1, 1) == 0);
@@ -56,59 +55,59 @@
 
     @Test
     public void max() {
-        Comparator<Integer> reversed =
+        final Comparator<Integer> reversed =
                 ComparatorUtils.reversedComparator(ComparatorUtils.<Integer>naturalComparator());
 
         assertEquals(Integer.valueOf(10), ComparatorUtils.max(1, 10, null));
         assertEquals(Integer.valueOf(10), ComparatorUtils.max(10, -10, null));
-        
+
         assertEquals(Integer.valueOf(1), ComparatorUtils.max(1, 10, reversed));
         assertEquals(Integer.valueOf(-10), ComparatorUtils.max(10, -10, reversed));
 
         try {
             ComparatorUtils.max(1, null, null);
             fail("expecting NullPointerException");
-        } catch (NullPointerException npe) {
+        } catch (final NullPointerException npe) {
             // expected
         }
 
         try {
             ComparatorUtils.max(null, 10, null);
             fail("expecting NullPointerException");
-        } catch (NullPointerException npe) {
+        } catch (final NullPointerException npe) {
             // expected
         }
     }
 
     @Test
     public void min() {
-        Comparator<Integer> reversed =
+        final Comparator<Integer> reversed =
                 ComparatorUtils.reversedComparator(ComparatorUtils.<Integer>naturalComparator());
 
         assertEquals(Integer.valueOf(1), ComparatorUtils.min(1, 10, null));
         assertEquals(Integer.valueOf(-10), ComparatorUtils.min(10, -10, null));
-        
+
         assertEquals(Integer.valueOf(10), ComparatorUtils.min(1, 10, reversed));
         assertEquals(Integer.valueOf(10), ComparatorUtils.min(10, -10, reversed));
 
         try {
             ComparatorUtils.min(1, null, null);
             fail("expecting NullPointerException");
-        } catch (NullPointerException npe) {
+        } catch (final NullPointerException npe) {
             // expected
         }
 
         try {
             ComparatorUtils.min(null, 10, null);
             fail("expecting NullPointerException");
-        } catch (NullPointerException npe) {
+        } catch (final NullPointerException npe) {
             // expected
         }
     }
 
     @Test
     public void nullLowComparator() {
-        Comparator<Integer> comp = ComparatorUtils.nullLowComparator(null);
+        final Comparator<Integer> comp = ComparatorUtils.nullLowComparator(null);
         assertTrue(comp.compare(null, 10) < 0);
         assertTrue(comp.compare(null, null) == 0);
         assertTrue(comp.compare(10, null) > 0);
@@ -116,7 +115,7 @@
 
     @Test
     public void nullHighComparator() {
-        Comparator<Integer> comp = ComparatorUtils.nullHighComparator(null);
+        final Comparator<Integer> comp = ComparatorUtils.nullHighComparator(null);
         assertTrue(comp.compare(null, 10) > 0);
         assertTrue(comp.compare(null, null) == 0);
         assertTrue(comp.compare(10, null) < 0);
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/EnumerationUtilsTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/EnumerationUtilsTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/EnumerationUtilsTest.java	2015-06-01 21:53:01.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/EnumerationUtilsTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -32,7 +32,6 @@
 /**
  * Tests EnumerationUtils.
  *
- * @version $Id: EnumerationUtilsTest.java 1683009 2015-06-01 21:53:01Z tn $
  */
 public class EnumerationUtilsTest {
 
@@ -40,12 +39,12 @@
 
     @Test
     public void testToListWithStringTokenizer() {
-        final List<String> expectedList1 = new ArrayList<String>();
+        final List<String> expectedList1 = new ArrayList<>();
         final StringTokenizer st = new StringTokenizer(TO_LIST_FIXTURE);
              while (st.hasMoreTokens()) {
                  expectedList1.add(st.nextToken());
              }
-        final List<String> expectedList2 = new ArrayList<String>();
+        final List<String> expectedList2 = new ArrayList<>();
         expectedList2.add("this");
         expectedList2.add("is");
         expectedList2.add("a");
@@ -58,7 +57,7 @@
 
     @Test
     public void testToListWithHashtable() {
-        final Hashtable<String, Integer> expected = new Hashtable<String, Integer>();
+        final Hashtable<String, Integer> expected = new Hashtable<>();
         expected.put("one", Integer.valueOf(1));
         expected.put("two", Integer.valueOf(2));
         expected.put("three", Integer.valueOf(3));
@@ -68,7 +67,7 @@
         assertTrue(actualEltList.contains(Integer.valueOf(1)));
         assertTrue(actualEltList.contains(Integer.valueOf(2)));
         assertTrue(actualEltList.contains(Integer.valueOf(3)));
-        final List<Integer> expectedEltList = new ArrayList<Integer>();
+        final List<Integer> expectedEltList = new ArrayList<>();
         expectedEltList.add(Integer.valueOf(1));
         expectedEltList.add(Integer.valueOf(2));
         expectedEltList.add(Integer.valueOf(3));
@@ -80,7 +79,7 @@
         assertTrue(actualKeyList.contains("one"));
         assertTrue(actualKeyList.contains("two"));
         assertTrue(actualKeyList.contains("three"));
-        final List<String> expectedKeyList = new ArrayList<String>();
+        final List<String> expectedKeyList = new ArrayList<>();
         expectedKeyList.add("one");
         expectedKeyList.add("two");
         expectedKeyList.add("three");
@@ -90,7 +89,7 @@
     @Test
     public void getFromEnumeration() throws Exception {
         // Enumeration, entry exists
-        final Vector<String> vector = new Vector<String>();
+        final Vector<String> vector = new Vector<>();
         vector.addElement("zero");
         vector.addElement("one");
         Enumeration<String> en = vector.elements();
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/FactoryUtilsTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/FactoryUtilsTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/FactoryUtilsTest.java	2015-11-14 13:24:24.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/FactoryUtilsTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -36,7 +36,6 @@
  * Tests the org.apache.commons.collections.FactoryUtils class.
  *
  * @since 3.0
- * @version $Id: FactoryUtilsTest.java 1714318 2015-11-14 13:24:24Z tn $
  */
 public class FactoryUtilsTest {
 
@@ -111,7 +110,7 @@
     @Test
     public void testPrototypeFactoryPublicCopyConstructor() throws Exception {
         final Mock1 proto = new Mock1(6);
-        Factory<Object> factory = FactoryUtils.<Object>prototypeFactory(proto);
+        final Factory<Object> factory = FactoryUtils.<Object>prototypeFactory(proto);
         assertNotNull(factory);
         final Object created = factory.create();
         assertTrue(proto != created);
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/FluentIterableTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/FluentIterableTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/FluentIterableTest.java	2015-11-23 21:23:14.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/FluentIterableTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -41,7 +41,6 @@
  * Tests for FluentIterable.
  *
  * @since 4.1
- * @version $Id: FluentIterableTest.java 1715956 2015-11-23 21:23:14Z tn $
  */
 public class FluentIterableTest {
 
@@ -72,7 +71,7 @@
 
     @Before
     public void setUp() {
-        Collection<Integer> collectionA = new ArrayList<Integer>();
+        final Collection<Integer> collectionA = new ArrayList<>();
         collectionA.add(1);
         collectionA.add(2);
         collectionA.add(2);
@@ -85,7 +84,7 @@
         collectionA.add(4);
         iterableA = collectionA;
 
-        Collection<Long> collectionB = new LinkedList<Long>();
+        final Collection<Long> collectionB = new LinkedList<>();
         collectionB.add(5L);
         collectionB.add(4L);
         collectionB.add(4L);
@@ -130,14 +129,14 @@
         try {
             FluentIterable.of(it).toList();
             fail("expecting NullPointerException");
-        } catch (NullPointerException npe) {
+        } catch (final NullPointerException npe) {
             // expected
         }
     }
 
     @Test
     public void appendElements() {
-        FluentIterable<Integer> it = FluentIterable.of(iterableA).append(10, 20, 30);
+        final FluentIterable<Integer> it = FluentIterable.of(iterableA).append(10, 20, 30);
         assertEquals(IterableUtils.size(iterableA) + 3, IterableUtils.size(it));
         assertTrue(IterableUtils.contains(it, 1));
         assertTrue(IterableUtils.contains(it, 10));
@@ -145,14 +144,14 @@
         assertTrue(IterableUtils.contains(it, 30));
         assertFalse(IterableUtils.contains(it, 40));
 
-        FluentIterable<Integer> empty = FluentIterable.of(emptyIterable).append();
+        final FluentIterable<Integer> empty = FluentIterable.of(emptyIterable).append();
         assertTrue(IterableUtils.isEmpty(empty));
     }
 
     @Test
     public void appendIterable() {
-        List<Integer> listB = Arrays.asList(10, 20, 30);
-        FluentIterable<Integer> it = FluentIterable.of(iterableA).append(listB);
+        final List<Integer> listB = Arrays.asList(10, 20, 30);
+        final FluentIterable<Integer> it = FluentIterable.of(iterableA).append(listB);
         assertEquals(IterableUtils.size(iterableA) + listB.size(), IterableUtils.size(it));
         assertTrue(IterableUtils.contains(it, 1));
         assertTrue(IterableUtils.contains(it, 10));
@@ -163,8 +162,8 @@
 
     @Test
     public void collate() {
-        List<Integer> result = FluentIterable.of(iterableOdd).collate(iterableEven).toList();
-        List<Integer> combinedList = new ArrayList<Integer>();
+        final List<Integer> result = FluentIterable.of(iterableOdd).collate(iterableEven).toList();
+        final List<Integer> combinedList = new ArrayList<>();
         CollectionUtils.addAll(combinedList, iterableOdd);
         CollectionUtils.addAll(combinedList, iterableEven);
         Collections.sort(combinedList);
@@ -173,7 +172,7 @@
         try {
             FluentIterable.of(iterableOdd).collate(null).toList();
             fail("expecting NullPointerException");
-        } catch (NullPointerException npe) {
+        } catch (final NullPointerException npe) {
             // expected
         }
     }
@@ -186,7 +185,7 @@
                     .collate(iterableEven, ComparatorUtils.<Integer>naturalComparator())
                     .toList();
 
-        List<Integer> combinedList = new ArrayList<Integer>();
+        final List<Integer> combinedList = new ArrayList<>();
         CollectionUtils.addAll(combinedList, iterableOdd);
         CollectionUtils.addAll(combinedList, iterableEven);
         Collections.sort(combinedList);
@@ -199,9 +198,9 @@
 
     @Test
     public void filter() {
-        Predicate<Integer> smallerThan3 = new Predicate<Integer>() {
+        final Predicate<Integer> smallerThan3 = new Predicate<Integer>() {
             @Override
-            public boolean evaluate(Integer object) {
+            public boolean evaluate(final Integer object) {
                 return object.intValue() < 3;
             }
         };
@@ -216,7 +215,7 @@
         try {
             FluentIterable.of(iterableA).filter(null).toList();
             fail("expecting NullPointerException");
-        } catch (NullPointerException npe) {
+        } catch (final NullPointerException npe) {
             // expected
         }
     }
@@ -224,16 +223,16 @@
     @Test
     public void forEach() {
         final AtomicInteger sum = new AtomicInteger(0);
-        Closure<Integer> closure = new Closure<Integer>() {
+        final Closure<Integer> closure = new Closure<Integer>() {
             @Override
-            public void execute(Integer input) {
+            public void execute(final Integer input) {
                 sum.addAndGet(input);
             }
         };
 
         FluentIterable.of(iterableA).forEach(closure);
         int expectedSum = 0;
-        for (Integer i : iterableA) {
+        for (final Integer i : iterableA) {
             expectedSum += i;
         }
         assertEquals(expectedSum, sum.get());
@@ -241,7 +240,7 @@
         try {
             FluentIterable.of(iterableA).forEach((Closure<Integer>) null);
             fail("expecting NullPointerException");
-        } catch (NullPointerException npe) {
+        } catch (final NullPointerException npe) {
             // expected
         }
     }
@@ -254,7 +253,7 @@
 
         // limit larger than input
         result = FluentIterable.of(iterableA).limit(100).toList();
-        List<Integer> expected = IterableUtils.toList(iterableA);
+        final List<Integer> expected = IterableUtils.toList(iterableA);
         assertEquals(expected.size(), result.size());
         assertEquals(expected, result);
 
@@ -269,7 +268,7 @@
         try {
             FluentIterable.of(iterableA).limit(-2).toList();
             fail("expecting IllegalArgumentException");
-        } catch (IllegalArgumentException iae) {
+        } catch (final IllegalArgumentException iae) {
             // expected
         }
     }
@@ -277,7 +276,7 @@
     @Test
     public void reverse() {
         List<Integer> result = FluentIterable.of(iterableA).reverse().toList();
-        List<Integer> expected = IterableUtils.toList(iterableA);
+        final List<Integer> expected = IterableUtils.toList(iterableA);
         Collections.reverse(expected);
         assertEquals(expected, result);
 
@@ -298,7 +297,7 @@
 
         // skip 0 elements
         result = FluentIterable.of(iterableA).skip(0).toList();
-        List<Integer> expected = IterableUtils.toList(iterableA);
+        final List<Integer> expected = IterableUtils.toList(iterableA);
         assertEquals(expected.size(), result.size());
         assertEquals(expected, result);
 
@@ -309,16 +308,16 @@
         try {
             FluentIterable.of(iterableA).skip(-4).toList();
             fail("expecting IllegalArgumentException");
-        } catch (IllegalArgumentException iae) {
+        } catch (final IllegalArgumentException iae) {
             // expected
         }
     }
 
     @Test
     public void transform() {
-        Transformer<Integer, Integer> squared = new Transformer<Integer, Integer>() {
+        final Transformer<Integer, Integer> squared = new Transformer<Integer, Integer>() {
             @Override
-            public Integer transform(Integer object) {
+            public Integer transform(final Integer object) {
                 return object * object;
             }
         };
@@ -333,7 +332,7 @@
         try {
             FluentIterable.of(iterableA).transform(null).toList();
             fail("expecting NullPointerException");
-        } catch (NullPointerException npe) {
+        } catch (final NullPointerException npe) {
             // expected
         }
     }
@@ -351,18 +350,18 @@
 
     @Test
     public void unmodifiable() {
-        FluentIterable<Integer> iterable1 = FluentIterable.of(iterableA).unmodifiable();
-        Iterator<Integer> it = iterable1.iterator();
+        final FluentIterable<Integer> iterable1 = FluentIterable.of(iterableA).unmodifiable();
+        final Iterator<Integer> it = iterable1.iterator();
         assertEquals(1, it.next().intValue());
         try {
             it.remove();
             fail("expecting UnsupportedOperationException");
-        } catch (UnsupportedOperationException ise) {
+        } catch (final UnsupportedOperationException ise) {
             // expected
         }
 
         // calling unmodifiable on an already unmodifiable iterable shall return the same instance
-        FluentIterable<Integer> iterable2 = iterable1.unmodifiable();
+        final FluentIterable<Integer> iterable2 = iterable1.unmodifiable();
         assertSame(iterable1, iterable2);
     }
 
@@ -370,7 +369,7 @@
     @Test
     public void zip() {
         List<Integer> result = FluentIterable.of(iterableOdd).zip(iterableEven).toList();
-        List<Integer> combinedList = new ArrayList<Integer>();
+        List<Integer> combinedList = new ArrayList<>();
         CollectionUtils.addAll(combinedList, iterableOdd);
         CollectionUtils.addAll(combinedList, iterableEven);
         Collections.sort(combinedList);
@@ -379,10 +378,10 @@
         try {
             FluentIterable.of(iterableOdd).zip((Iterable<Integer>) null).toList();
             fail("expecting NullPointerException");
-        } catch (NullPointerException npe) {
+        } catch (final NullPointerException npe) {
             // expected
         }
-        
+
         result = FluentIterable
                     .of(Arrays.asList(1, 4, 7))
                     .zip(Arrays.asList(2, 5, 8), Arrays.asList(3, 6, 9))
@@ -394,7 +393,7 @@
     @Test
     public void asEnumeration() {
         Enumeration<Long> enumeration = FluentIterable.of(iterableB).asEnumeration();
-        List<Long> result = EnumerationUtils.toList(enumeration);
+        final List<Long> result = EnumerationUtils.toList(enumeration);
         assertEquals(iterableB, result);
 
         enumeration = FluentIterable.<Long>empty().asEnumeration();
@@ -410,7 +409,7 @@
         try {
             FluentIterable.of(iterableEven).allMatch(null);
             fail("expecting NullPointerException");
-        } catch (NullPointerException npe) {
+        } catch (final NullPointerException npe) {
             // expected
         }
     }
@@ -424,7 +423,7 @@
         try {
             FluentIterable.of(iterableEven).anyMatch(null);
             fail("expecting NullPointerException");
-        } catch (NullPointerException npe) {
+        } catch (final NullPointerException npe) {
             // expected
         }
     }
@@ -440,7 +439,7 @@
         try {
             FluentIterable.of((Iterable<?>) null).size();
             fail("expecting NullPointerException");
-        } catch (NullPointerException npe) {
+        } catch (final NullPointerException npe) {
             // expected
         }
         assertEquals(0, FluentIterable.of(emptyIterable).size());
@@ -449,10 +448,10 @@
 
     @Test
     public void eval() {
-        List<Integer> listNumbers = new ArrayList<Integer>();
+        final List<Integer> listNumbers = new ArrayList<>();
         listNumbers.addAll(Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10));
-        FluentIterable<Integer> iterable = FluentIterable.of(listNumbers).filter(EVEN);
-        FluentIterable<Integer> materialized = iterable.eval();
+        final FluentIterable<Integer> iterable = FluentIterable.of(listNumbers).filter(EVEN);
+        final FluentIterable<Integer> materialized = iterable.eval();
 
         listNumbers.addAll(Arrays.asList(11, 12, 13, 14, 15, 16, 17, 18, 19, 20));
         assertEquals(5, materialized.size());
@@ -472,20 +471,20 @@
 
     @Test
     public void copyInto() {
-        List<Integer> result = new ArrayList<Integer>();
+        List<Integer> result = new ArrayList<>();
         FluentIterable.of(iterableA).copyInto(result);
 
         List<Integer> expected = IterableUtils.toList(iterableA);
         assertEquals(expected.size(), result.size());
         assertEquals(expected, result);
 
-        result = new ArrayList<Integer>();
+        result = new ArrayList<>();
         result.add(10);
         result.add(9);
         result.add(8);
         FluentIterable.of(iterableA).copyInto(result);
 
-        expected = new ArrayList<Integer>();
+        expected = new ArrayList<>();
         expected.addAll(Arrays.asList(10, 9, 8));
         expected.addAll(IterableUtils.toList(iterableA));
         assertEquals(expected.size(), result.size());
@@ -494,7 +493,7 @@
         try {
             FluentIterable.of(iterableA).copyInto(null);
             fail("expecting NullPointerException");
-        } catch (NullPointerException npe) {
+        } catch (final NullPointerException npe) {
             // expected
         }
     }
@@ -515,14 +514,14 @@
         try {
             FluentIterable.of(iterableEven).get(-1);
             fail("expecting IndexOutOfBoundsException");
-        } catch (IndexOutOfBoundsException ioe) {
+        } catch (final IndexOutOfBoundsException ioe) {
             // expected
         }
 
         try {
             FluentIterable.of(iterableEven).get(IterableUtils.size(iterableEven));
             fail("expecting IndexOutOfBoundsException");
-        } catch (IndexOutOfBoundsException ioe) {
+        } catch (final IndexOutOfBoundsException ioe) {
             // expected
         }
     }
@@ -530,14 +529,14 @@
     @SuppressWarnings({ "rawtypes", "unchecked" })
     @Test
     public void toArray() {
-        Long[] arr = new Long[] {1L, 2L, 3L, 4L, 5L};
-        Long[] result = FluentIterable.of(arr).toArray(Long.class);
+        final Long[] arr = new Long[] {1L, 2L, 3L, 4L, 5L};
+        final Long[] result = FluentIterable.of(arr).toArray(Long.class);
         assertNotNull(result);
         assertArrayEquals(arr, result);
 
         try {
             FluentIterable.of(arr).toArray((Class) String.class);
-        } catch (ArrayStoreException ase) {
+        } catch (final ArrayStoreException ase) {
             // expected
         }
     }
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/functors/AbstractAnyAllOnePredicateTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/functors/AbstractAnyAllOnePredicateTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/functors/AbstractAnyAllOnePredicateTest.java	2013-04-17 17:37:03.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/functors/AbstractAnyAllOnePredicateTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -29,7 +29,6 @@
  * Base class for tests of AnyPredicate, AllPredicate, and OnePredicate.
  *
  * @since 3.0
- * @version $Id: AbstractAnyAllOnePredicateTest.java 1469004 2013-04-17 17:37:03Z tn $
  */
 public abstract class AbstractAnyAllOnePredicateTest<T> extends AbstractCompositePredicateTest<T> {
 
@@ -70,7 +69,7 @@
 
     /**
      * Tests creating composite predicate instances with single predicates and verifies that the composite returns
-     * the same value as the single predicate does. 
+     * the same value as the single predicate does.
      */
     @SuppressWarnings("boxing")
     public final void singleValues() {
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/functors/AbstractCompositePredicateTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/functors/AbstractCompositePredicateTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/functors/AbstractCompositePredicateTest.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/functors/AbstractCompositePredicateTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -29,7 +29,6 @@
  * Base class for tests of composite predicates.
  *
  * @since 3.0
- * @version $Id: AbstractCompositePredicateTest.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public abstract class AbstractCompositePredicateTest<T> extends AbstractMockPredicateTest<T> {
 
@@ -69,7 +68,7 @@
      * @return a predicate to test.
      */
     protected final Predicate<T> getPredicateInstance(final Boolean... mockReturnValues) {
-        final List<Predicate<T>> predicates = new ArrayList<Predicate<T>>();
+        final List<Predicate<T>> predicates = new ArrayList<>();
         for (final Boolean returnValue : mockReturnValues) {
             predicates.add(createMockPredicate(returnValue));
         }
@@ -137,7 +136,7 @@
      */
     @Test(expected = NullPointerException.class)
     public final void nullElementsInCollectionToGetInstance() {
-        final Collection<Predicate<T>> coll = new ArrayList<Predicate<T>>();
+        final Collection<Predicate<T>> coll = new ArrayList<>();
         coll.add(null);
         coll.add(null);
         getPredicateInstance(coll);
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/functors/AbstractMockPredicateTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/functors/AbstractMockPredicateTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/functors/AbstractMockPredicateTest.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/functors/AbstractMockPredicateTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -31,7 +31,6 @@
  * provides methods to create and verify mock predicates to which to delegate.
  *
  * @since 3.0
- * @version $Id: AbstractMockPredicateTest.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 public abstract class AbstractMockPredicateTest<T> {
     /**
@@ -59,7 +58,7 @@
     @Before
     public final void createVerifyList()
     {
-        mockPredicatesToVerify = new ArrayList<Predicate<? super T>>();
+        mockPredicatesToVerify = new ArrayList<>();
     }
 
     /**
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/functors/AllPredicateTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/functors/AllPredicateTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/functors/AllPredicateTest.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/functors/AllPredicateTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -30,7 +30,6 @@
  * Tests the org.apache.commons.collections.functors.AllPredicate class.
  *
  * @since 3.0
- * @version $Id: AllPredicateTest.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 @SuppressWarnings("boxing")
 public class AllPredicateTest extends AbstractAnyAllOnePredicateTest<Integer> {
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/functors/ComparatorPredicateTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/functors/ComparatorPredicateTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/functors/ComparatorPredicateTest.java	2013-04-30 14:27:35.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/functors/ComparatorPredicateTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -26,6 +26,7 @@
 
 public class ComparatorPredicateTest extends AbstractPredicateTest {
     private class TestComparator<T extends Comparable<T>> implements Comparator<T> {
+        @Override
         public int compare(final T first, final T second) {
             return first.compareTo(second);
         }
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/IterableUtilsTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/IterableUtilsTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/IterableUtilsTest.java	2015-06-22 19:48:47.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/IterableUtilsTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -42,7 +42,6 @@
  * Tests for IterableUtils.
  *
  * @since 4.1
- * @version $Id: IterableUtilsTest.java 1686921 2015-06-22 19:48:47Z tn $
  */
 public class IterableUtilsTest {
 
@@ -63,7 +62,7 @@
 
     @Before
     public void setUp() {
-        Collection<Integer> collectionA = new ArrayList<Integer>();
+        final Collection<Integer> collectionA = new ArrayList<>();
         collectionA.add(1);
         collectionA.add(2);
         collectionA.add(2);
@@ -76,7 +75,7 @@
         collectionA.add(4);
         iterableA = collectionA;
 
-        Collection<Long> collectionB = new LinkedList<Long>();
+        final Collection<Long> collectionB = new LinkedList<>();
         collectionB.add(5L);
         collectionB.add(4L);
         collectionB.add(4L);
@@ -109,14 +108,14 @@
     // -----------------------------------------------------------------------
     @Test
     public void forEach() {
-        final List<Integer> listA = new ArrayList<Integer>();
+        final List<Integer> listA = new ArrayList<>();
         listA.add(1);
 
-        final List<Integer> listB = new ArrayList<Integer>();
+        final List<Integer> listB = new ArrayList<>();
         listB.add(2);
 
         final Closure<List<Integer>> testClosure = ClosureUtils.invokerClosure("clear");
-        final Collection<List<Integer>> col = new ArrayList<List<Integer>>();
+        final Collection<List<Integer>> col = new ArrayList<>();
         col.add(listA);
         col.add(listB);
         IterableUtils.forEach(col, testClosure);
@@ -124,7 +123,7 @@
         try {
             IterableUtils.forEach(col, null);
             fail("expecting NullPointerException");
-        } catch (NullPointerException npe) {
+        } catch (final NullPointerException npe) {
             // expected
         }
 
@@ -138,21 +137,21 @@
     @Test(expected = FunctorException.class)
     public void forEachFailure() {
         final Closure<String> testClosure = ClosureUtils.invokerClosure("clear");
-        final Collection<String> col = new ArrayList<String>();
+        final Collection<String> col = new ArrayList<>();
         col.add("x");
         IterableUtils.forEach(col, testClosure);
     }
 
     @Test
     public void forEachButLast() {
-        final List<Integer> listA = new ArrayList<Integer>();
+        final List<Integer> listA = new ArrayList<>();
         listA.add(1);
 
-        final List<Integer> listB = new ArrayList<Integer>();
+        final List<Integer> listB = new ArrayList<>();
         listB.add(2);
 
         final Closure<List<Integer>> testClosure = ClosureUtils.invokerClosure("clear");
-        final Collection<List<Integer>> col = new ArrayList<List<Integer>>();
+        final Collection<List<Integer>> col = new ArrayList<>();
         col.add(listA);
         col.add(listB);
         List<Integer> last = IterableUtils.forEachButLast(col, testClosure);
@@ -162,7 +161,7 @@
         try {
             IterableUtils.forEachButLast(col, null);
             fail("expecting NullPointerException");
-        } catch (NullPointerException npe) {
+        } catch (final NullPointerException npe) {
             // expected
         }
 
@@ -177,7 +176,7 @@
 
     @Test
     public void containsWithEquator() {
-        final List<String> base = new ArrayList<String>();
+        final List<String> base = new ArrayList<>();
         base.add("AC");
         base.add("BB");
         base.add("CA");
@@ -185,12 +184,12 @@
         final Equator<String> secondLetterEquator = new Equator<String>() {
 
             @Override
-            public boolean equate(String o1, String o2) {
+            public boolean equate(final String o1, final String o2) {
                 return o1.charAt(1) == o2.charAt(1);
             }
 
             @Override
-            public int hash(String o) {
+            public int hash(final String o) {
                 return o.charAt(1);
             }
 
@@ -229,12 +228,12 @@
         // Ensure that generic bounds accept valid parameters, but return
         // expected results
         // e.g. no longs in the "int" Iterable<Number>, and vice versa.
-        Iterable<Number> iterableIntAsNumber = Arrays.<Number>asList(1, 2, 3, 4, 5);
-        Iterable<Number> iterableLongAsNumber = Arrays.<Number>asList(1L, 2L, 3L, 4L, 5L);
+        final Iterable<Number> iterableIntAsNumber = Arrays.<Number>asList(1, 2, 3, 4, 5);
+        final Iterable<Number> iterableLongAsNumber = Arrays.<Number>asList(1L, 2L, 3L, 4L, 5L);
         assertEquals(0, IterableUtils.frequency(iterableIntAsNumber, 2L));
         assertEquals(0, IterableUtils.frequency(iterableLongAsNumber, 2));
 
-        final Set<String> set = new HashSet<String>();
+        final Set<String> set = new HashSet<>();
         set.add("A");
         set.add("C");
         set.add("E");
@@ -245,7 +244,7 @@
         assertEquals(0, IterableUtils.frequency(set, "D"));
         assertEquals(1, IterableUtils.frequency(set, "E"));
 
-        final Bag<String> bag = new HashBag<String>();
+        final Bag<String> bag = new HashBag<>();
         bag.add("A", 3);
         bag.add("C");
         bag.add("E");
@@ -259,7 +258,7 @@
 
     @Test
     public void frequencyOfNull() {
-        final List<String> list = new ArrayList<String>();
+        final List<String> list = new ArrayList<>();
         assertEquals(0, IterableUtils.frequency(list, null));
         list.add("A");
         assertEquals(0, IterableUtils.frequency(list, null));
@@ -302,7 +301,7 @@
         assertEquals(-1, index);
         assertEquals(-1, IterableUtils.indexOf(null, testPredicate));
         try {
-            assertNull(IterableUtils.indexOf(iterableA, null));
+            IterableUtils.indexOf(iterableA, null);
             fail("expecting NullPointerException");
         } catch (final NullPointerException npe) {
             // expected
@@ -317,33 +316,33 @@
         try {
             assertEquals(0, IterableUtils.countMatches(iterableA, null));
             fail("predicate must not be null");
-        } catch (NullPointerException ex) {
+        } catch (final NullPointerException ex) {
             // expected
         }
 
         try {
             assertEquals(0, IterableUtils.countMatches(null, null));
             fail("predicate must not be null");
-        } catch (NullPointerException ex) {
+        } catch (final NullPointerException ex) {
             // expected
         }
     }
 
     @Test
     public void matchesAny() {
-        final List<Integer> list = new ArrayList<Integer>();
-        
+        final List<Integer> list = new ArrayList<>();
+
         try {
             assertFalse(IterableUtils.matchesAny(null, null));
             fail("predicate must not be null");
-        } catch (NullPointerException ex) {
+        } catch (final NullPointerException ex) {
             // expected
         }
 
         try {
             assertFalse(IterableUtils.matchesAny(list, null));
             fail("predicate must not be null");
-        } catch (NullPointerException ex) {
+        } catch (final NullPointerException ex) {
             // expected
         }
 
@@ -363,28 +362,28 @@
         try {
             assertFalse(IterableUtils.matchesAll(null, null));
             fail("predicate must not be null");
-        } catch (NullPointerException ex) {
+        } catch (final NullPointerException ex) {
             // expected
         }
 
         try {
             assertFalse(IterableUtils.matchesAll(iterableA, null));
             fail("predicate must not be null");
-        } catch (NullPointerException ex) {
+        } catch (final NullPointerException ex) {
             // expected
         }
 
-        Predicate<Integer> lessThanFive = new Predicate<Integer>() {
+        final Predicate<Integer> lessThanFive = new Predicate<Integer>() {
             @Override
-            public boolean evaluate(Integer object) {
+            public boolean evaluate(final Integer object) {
                 return object < 5;
             }
         };
         assertTrue(IterableUtils.matchesAll(iterableA, lessThanFive));
 
-        Predicate<Integer> lessThanFour = new Predicate<Integer>() {
+        final Predicate<Integer> lessThanFour = new Predicate<Integer>() {
             @Override
-            public boolean evaluate(Integer object) {
+            public boolean evaluate(final Integer object) {
                 return object < 4;
             }
         };
@@ -394,38 +393,58 @@
         assertTrue(IterableUtils.matchesAll(emptyIterable, lessThanFour));
     }
 
-    @Test(expected = IndexOutOfBoundsException.class)
     public void getFromIterable() throws Exception {
         // Collection, entry exists
-        final Bag<String> bag = new HashBag<String>();
+        final Bag<String> bag = new HashBag<>();
         bag.add("element", 1);
         assertEquals("element", IterableUtils.get(bag, 0));
+    }
 
+    @Test(expected = IndexOutOfBoundsException.class)
+    public void getFromIterableIndexOutOfBoundsException() throws Exception {
+        // Collection, entry exists
+        final Bag<String> bag = new HashBag<>();
+        bag.add("element", 1);
         // Collection, non-existent entry
         IterableUtils.get(bag, 1);
     }
 
+    public void firstFromIterable() throws Exception {
+        // Collection, entry exists
+        final Bag<String> bag = new HashBag<>();
+        bag.add("element", 1);
+        assertEquals("element", IterableUtils.first(bag));
+    }
+
+    @Test(expected = IndexOutOfBoundsException.class)
+    public void firstFromIterableIndexOutOfBoundsException() throws Exception {
+        // Collection, entry exists
+        final Bag<String> bag = new HashBag<>();
+        // Collection, non-existent entry
+        IterableUtils.first(bag);
+    }
+
     @SuppressWarnings("unchecked")
     @Test
     public void partition() {
-        List<Integer> input = new ArrayList<Integer>();
+        final List<Integer> input = new ArrayList<>();
         input.add(1);
         input.add(2);
         input.add(3);
         input.add(4);
         List<List<Integer>> partitions = IterableUtils.partition(input, EQUALS_TWO);
         assertEquals(2, partitions.size());
-        
+
         // first partition contains 2
         Collection<Integer> partition = partitions.get(0);
         assertEquals(1, partition.size());
         assertEquals(2, CollectionUtils.extractSingleton(partition).intValue());
-        
+
         // second partition contains 1, 3, and 4
-        Integer[] expected = {1, 3, 4};
+        final Integer[] expected = {1, 3, 4};
         partition = partitions.get(1);
         Assert.assertArrayEquals(expected, partition.toArray());
-        
+
         partitions = IterableUtils.partition((List<Integer>) null, EQUALS_TWO);
         assertEquals(2, partitions.size());
         assertTrue(partitions.get(0).isEmpty());
@@ -438,7 +457,7 @@
         try {
             IterableUtils.partition(input, (Predicate<Integer>) null);
             fail("expecting NullPointerException");
-        } catch (NullPointerException npe) {
+        } catch (final NullPointerException npe) {
             // expected
         }
     }
@@ -446,31 +465,31 @@
     @SuppressWarnings("unchecked")
     @Test
     public void partitionMultiplePredicates() {
-        List<Integer> input = new ArrayList<Integer>();
+        final List<Integer> input = new ArrayList<>();
         input.add(1);
         input.add(2);
         input.add(3);
         input.add(4);
-        List<List<Integer>> partitions = IterableUtils.partition(input, EQUALS_TWO, EVEN);
+        final List<List<Integer>> partitions = IterableUtils.partition(input, EQUALS_TWO, EVEN);
 
         // first partition contains 2
         Collection<Integer> partition = partitions.get(0);
         assertEquals(1, partition.size());
         assertEquals(2, partition.iterator().next().intValue());
-        
+
         // second partition contains 4
         partition = partitions.get(1);
         assertEquals(1, partition.size());
         assertEquals(4, partition.iterator().next().intValue());
-        
+
         // third partition contains 1 and 3
-        Integer[] expected = {1, 3};
+        final Integer[] expected = {1, 3};
         partition = partitions.get(2);
         Assert.assertArrayEquals(expected, partition.toArray());
 
         try {
             IterableUtils.partition(input, EQUALS_TWO, null);
-        } catch (NullPointerException npe) {
+        } catch (final NullPointerException npe) {
             // expected
         }
     }
@@ -479,7 +498,7 @@
     public void testToString() {
         String result = IterableUtils.toString(iterableA);
         assertEquals("[1, 2, 2, 3, 3, 3, 4, 4, 4, 4]", result);
-        
+
         result = IterableUtils.toString(new ArrayList<Integer>());
         assertEquals("[]", result);
 
@@ -488,7 +507,7 @@
 
         result = IterableUtils.toString(iterableA, new Transformer<Integer, String>() {
             @Override
-            public String transform(Integer input) {
+            public String transform(final Integer input) {
                 return new Integer(input * 2).toString();
             }
         });
@@ -496,7 +515,7 @@
 
         result = IterableUtils.toString(new ArrayList<Integer>(), new Transformer<Integer, String>() {
             @Override
-            public String transform(Integer input) {
+            public String transform(final Integer input) {
                 fail("not supposed to reach here");
                 return "";
             }
@@ -505,7 +524,7 @@
 
         result = IterableUtils.toString(null, new Transformer<Integer, String>() {
             @Override
-            public String transform(Integer input) {
+            public String transform(final Integer input) {
                 fail("not supposed to reach here");
                 return "";
             }
@@ -515,47 +534,47 @@
 
     @Test
     public void testToStringDelimiter() {
-        
-        Transformer<Integer, String> transformer = new Transformer<Integer, String>() {
+
+        final Transformer<Integer, String> transformer = new Transformer<Integer, String>() {
             @Override
-            public String transform(Integer input) {
+            public String transform(final Integer input) {
                 return new Integer(input * 2).toString();
             }
         };
-        
+
         String result = IterableUtils.toString(iterableA, transformer, "", "", "");
         assertEquals("2446668888", result);
-        
+
         result = IterableUtils.toString(iterableA, transformer, ",", "", "");
         assertEquals("2,4,4,6,6,6,8,8,8,8", result);
-        
+
         result = IterableUtils.toString(iterableA, transformer, "", "[", "]");
         assertEquals("[2446668888]", result);
-        
+
         result = IterableUtils.toString(iterableA, transformer, ",", "[", "]");
         assertEquals("[2,4,4,6,6,6,8,8,8,8]", result);
-        
+
         result = IterableUtils.toString(iterableA, transformer, ",", "[[", "]]");
         assertEquals("[[2,4,4,6,6,6,8,8,8,8]]", result);
-        
+
         result = IterableUtils.toString(iterableA, transformer, ",,", "[", "]");
         assertEquals("[2,,4,,4,,6,,6,,6,,8,,8,,8,,8]", result);
-        
+
         result = IterableUtils.toString(iterableA, transformer, ",,", "((", "))");
         assertEquals("((2,,4,,4,,6,,6,,6,,8,,8,,8,,8))", result);
 
         result = IterableUtils.toString(new ArrayList<Integer>(), transformer, "", "(", ")");
         assertEquals("()", result);
-        
+
         result = IterableUtils.toString(new ArrayList<Integer>(), transformer, "", "", "");
         assertEquals("", result);
     }
 
     @Test
     public void testToStringWithNullArguments() {
-        String result = IterableUtils.toString(null, new Transformer<Integer, String>() {
+        final String result = IterableUtils.toString(null, new Transformer<Integer, String>() {
             @Override
-            public String transform(Integer input) {
+            public String transform(final Integer input) {
                 fail("not supposed to reach here");
                 return "";
             }
@@ -572,7 +591,7 @@
         try {
             IterableUtils.toString(new ArrayList<Integer>(), new Transformer<Integer, String>() {
                 @Override
-                public String transform(Integer input) {
+                public String transform(final Integer input) {
                     fail("not supposed to reach here");
                     return "";
                 }
@@ -585,7 +604,7 @@
         try {
             IterableUtils.toString(new ArrayList<Integer>(), new Transformer<Integer, String>() {
                 @Override
-                public String transform(Integer input) {
+                public String transform(final Integer input) {
                     fail("not supposed to reach here");
                     return "";
                 }
@@ -598,7 +617,7 @@
         try {
             IterableUtils.toString(new ArrayList<Integer>(), new Transformer<Integer, String>() {
                 @Override
-                public String transform(Integer input) {
+                public String transform(final Integer input) {
                     fail("not supposed to reach here");
                     return "";
                 }
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/AbstractIteratorTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/AbstractIteratorTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/AbstractIteratorTest.java	2013-11-11 21:58:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/AbstractIteratorTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -30,7 +30,6 @@
  * overriding the supportsXxx() methods if necessary.
  *
  * @since 3.0
- * @version $Id: AbstractIteratorTest.java 1540860 2013-11-11 21:58:27Z ebourg $
  */
 public abstract class AbstractIteratorTest<E> extends AbstractObjectTest {
 
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/AbstractListIteratorTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/AbstractListIteratorTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/AbstractListIteratorTest.java	2013-11-11 21:58:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/AbstractListIteratorTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -29,7 +29,6 @@
  * overriding the supportsXxx() methods if necessary.
  *
  * @since 3.0
- * @version $Id: AbstractListIteratorTest.java 1540860 2013-11-11 21:58:27Z ebourg $
  */
 public abstract class AbstractListIteratorTest<E> extends AbstractIteratorTest<E> {
 
@@ -122,7 +121,7 @@
      * Test navigation through the iterator.
      */
     public void testWalkForwardAndBack() {
-        final ArrayList<E> list = new ArrayList<E>();
+        final ArrayList<E> list = new ArrayList<>();
         final ListIterator<E> it = makeObject();
         while (it.hasNext()) {
             list.add(it.next());
@@ -167,6 +166,7 @@
             // check for UnsupportedOperationException if not supported
             try {
                 it.add(addValue);
+                fail("UnsupportedOperationException must be thrown from add of " + it.getClass().getSimpleName());
             } catch (final UnsupportedOperationException ex) {}
             return;
         }
@@ -202,6 +202,7 @@
             // check for UnsupportedOperationException if not supported
             try {
                 it.set(addSetValue());
+                fail("UnsupportedOperationException must be thrown from set in " + it.getClass().getSimpleName());
             } catch (final UnsupportedOperationException ex) {}
             return;
         }
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/AbstractMapIteratorTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/AbstractMapIteratorTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/AbstractMapIteratorTest.java	2013-11-11 21:58:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/AbstractMapIteratorTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -32,7 +32,6 @@
  * overriding the supportsXxx() methods if necessary.
  *
  * @since 3.0
- * @version $Id: AbstractMapIteratorTest.java 1540860 2013-11-11 21:58:27Z ebourg $
  */
 public abstract class AbstractMapIteratorTest<K, V> extends AbstractIteratorTest<K> {
 
@@ -167,7 +166,7 @@
         assertEquals(true, it.hasNext());
 
         assertEquals(true, it.hasNext());
-        final Set<K> set = new HashSet<K>();
+        final Set<K> set = new HashSet<>();
         while (it.hasNext()) {
             // getKey
             final K key = it.next();
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorTest.java	2013-11-11 21:58:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/AbstractOrderedMapIteratorTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -35,7 +35,6 @@
  * overriding the supportsXxx() methods if necessary.
  *
  * @since 3.0
- * @version $Id: AbstractOrderedMapIteratorTest.java 1540860 2013-11-11 21:58:27Z ebourg $
  */
 public abstract class AbstractOrderedMapIteratorTest<K, V> extends AbstractMapIteratorTest<K, V> {
 
@@ -92,7 +91,7 @@
 
         assertEquals(true, it.hasNext());
         assertEquals(false, it.hasPrevious());
-        final Set<K> set = new HashSet<K>();
+        final Set<K> set = new HashSet<>();
         while (it.hasNext()) {
             // getKey
             final K key = it.next();
@@ -143,12 +142,12 @@
         final OrderedMapIterator<K, V> it = makeObject();
         final Map<K, V> map = getMap();
 
-        assertEquals("keySet() not consistent", new ArrayList<K>(map.keySet()), new ArrayList<K>(map.keySet()));
+        assertEquals("keySet() not consistent", new ArrayList<>(map.keySet()), new ArrayList<>(map.keySet()));
 
         final Iterator<K> it2 = map.keySet().iterator();
         assertEquals(true, it.hasNext());
         assertEquals(true, it2.hasNext());
-        final List<K> list = new ArrayList<K>();
+        final List<K> list = new ArrayList<>();
         while (it.hasNext()) {
             final K key = it.next();
             assertEquals(it2.next(), key);
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/ArrayIterator2Test.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/ArrayIterator2Test.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/ArrayIterator2Test.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/ArrayIterator2Test.java	2018-07-08 00:18:18.000000000 +0000
@@ -22,7 +22,6 @@
 /**
  * Tests the ArrayIterator with primitive type arrays.
  *
- * @version $Id: ArrayIterator2Test.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 public class ArrayIterator2Test<E> extends AbstractIteratorTest<E> {
 
@@ -34,24 +33,24 @@
 
     @Override
     public ArrayIterator<E> makeEmptyIterator() {
-        return new ArrayIterator<E>(new int[0]);
+        return new ArrayIterator<>(new int[0]);
     }
 
     @Override
     public ArrayIterator<E> makeObject() {
-        return new ArrayIterator<E>(testArray);
+        return new ArrayIterator<>(testArray);
     }
 
     public ArrayIterator<E> makeArrayIterator(final Object array) {
-        return new ArrayIterator<E>(array);
+        return new ArrayIterator<>(array);
     }
 
     public ArrayIterator<E> makeArrayIterator(final Object array, final int index) {
-        return new ArrayIterator<E>(array, index);
+        return new ArrayIterator<>(array, index);
     }
 
     public ArrayIterator<E> makeArrayIterator(final Object array, final int start, final int end) {
-        return new ArrayIterator<E>(array, start, end);
+        return new ArrayIterator<>(array, start, end);
     }
 
     @Override
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/ArrayIteratorTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/ArrayIteratorTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/ArrayIteratorTest.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/ArrayIteratorTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -24,7 +24,6 @@
  * perform the iteration rather than the hasNext() method.
  * The code of this test was supplied by Mauricio S. Moura.
  *
- * @version $Id: ArrayIteratorTest.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 public class ArrayIteratorTest<E> extends AbstractIteratorTest<E> {
 
@@ -36,12 +35,12 @@
 
     @Override
     public ArrayIterator<E> makeEmptyIterator() {
-        return new ArrayIterator<E>(new Object[0]);
+        return new ArrayIterator<>(new Object[0]);
     }
 
     @Override
     public ArrayIterator<E> makeObject() {
-        return new ArrayIterator<E>(testArray);
+        return new ArrayIterator<>(testArray);
     }
 
     @Override
@@ -70,7 +69,7 @@
 
     public void testNullArray() {
         try {
-            new ArrayIterator<Object>(null);
+            new ArrayIterator<>(null);
             fail("Constructor should throw a NullPointerException when constructed with a null array");
         } catch (final NullPointerException e) {
             // expected
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/ArrayListIterator2Test.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/ArrayListIterator2Test.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/ArrayListIterator2Test.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/ArrayListIterator2Test.java	2018-07-08 00:18:18.000000000 +0000
@@ -19,7 +19,6 @@
 /**
  * Test the ArrayListIterator class with primitives.
  *
- * @version $Id: ArrayListIterator2Test.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 public class ArrayListIterator2Test<E> extends ArrayIterator2Test<E> {
 
@@ -29,24 +28,24 @@
 
     @Override
     public ArrayListIterator<E> makeEmptyIterator() {
-        return new ArrayListIterator<E>(new int[0]);
+        return new ArrayListIterator<>(new int[0]);
     }
 
     @Override
     public ArrayListIterator<E> makeObject() {
-        return new ArrayListIterator<E>(testArray);
+        return new ArrayListIterator<>(testArray);
     }
 
     public ArrayListIterator<E> makeArrayListIterator(final Object array) {
-        return new ArrayListIterator<E>(array);
+        return new ArrayListIterator<>(array);
     }
 
     public ArrayListIterator<E> makeArrayListIterator(final Object array, final int index) {
-        return new ArrayListIterator<E>(array, index);
+        return new ArrayListIterator<>(array, index);
     }
 
     public ArrayListIterator<E> makeArrayListIterator(final Object array, final int start, final int end) {
-        return new ArrayListIterator<E>(array, start, end);
+        return new ArrayListIterator<>(array, start, end);
     }
 
 }
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/ArrayListIteratorTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/ArrayListIteratorTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/ArrayListIteratorTest.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/ArrayListIteratorTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -23,7 +23,6 @@
 /**
  * Test the ArrayListIterator class.
  *
- * @version $Id: ArrayListIteratorTest.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 public class ArrayListIteratorTest<E> extends ArrayIteratorTest<E> {
 
@@ -33,16 +32,16 @@
 
     @Override
     public ArrayListIterator<E> makeEmptyIterator() {
-        return new ArrayListIterator<E>(new Object[0]);
+        return new ArrayListIterator<>(new Object[0]);
     }
 
     @Override
     public ArrayListIterator<E> makeObject() {
-        return new ArrayListIterator<E>(testArray);
+        return new ArrayListIterator<>(testArray);
     }
 
     public ArrayListIterator<E> makeArrayListIterator(final Object array) {
-        return new ArrayListIterator<E>(array);
+        return new ArrayListIterator<>(array);
     }
 
     @Override
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/BoundedIteratorTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/BoundedIteratorTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/BoundedIteratorTest.java	2014-03-03 21:25:39.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/BoundedIteratorTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -25,12 +25,11 @@
 /**
  * A unit test to test the basic functions of {@link BoundedIterator}.
  *
- * @version $Id: BoundedIteratorTest.java 1573753 2014-03-03 21:25:39Z tn $
  */
 public class BoundedIteratorTest<E> extends AbstractIteratorTest<E> {
 
     /** Test array of size 7 */
-    private String[] testArray = {
+    private final String[] testArray = {
         "a", "b", "c", "d", "e", "f", "g"
     };
 
@@ -50,12 +49,12 @@
 
     @Override
     public Iterator<E> makeEmptyIterator() {
-        return new BoundedIterator<E>(Collections.<E>emptyList().iterator(), 0, 10);
+        return new BoundedIterator<>(Collections.<E>emptyList().iterator(), 0, 10);
     }
 
     @Override
     public Iterator<E> makeObject() {
-        return new BoundedIterator<E>(new ArrayList<E>(testList).iterator(), 1, testList.size() - 1);
+        return new BoundedIterator<>(new ArrayList<>(testList).iterator(), 1, testList.size() - 1);
     }
 
     // ---------------- Tests ---------------------
@@ -67,7 +66,7 @@
      */
     @Test
     public void testBounded() {
-        Iterator<E> iter = new BoundedIterator<E>(testList.iterator(), 2, 4);
+        final Iterator<E> iter = new BoundedIterator<>(testList.iterator(), 2, 4);
 
         assertTrue(iter.hasNext());
         assertEquals("c", iter.next());
@@ -82,7 +81,7 @@
         try {
             iter.next();
             fail("Expected NoSuchElementException.");
-        } catch (NoSuchElementException nsee) { /* Success case */
+        } catch (final NoSuchElementException nsee) { /* Success case */
         }
     }
 
@@ -93,7 +92,7 @@
      */
     @Test
     public void testSameAsDecorated() {
-        Iterator<E> iter = new BoundedIterator<E>(testList.iterator(), 0,
+        final Iterator<E> iter = new BoundedIterator<>(testList.iterator(), 0,
                                                   testList.size());
 
         assertTrue(iter.hasNext());
@@ -115,7 +114,7 @@
         try {
             iter.next();
             fail("Expected NoSuchElementException.");
-        } catch (NoSuchElementException nsee) { /* Success case */
+        } catch (final NoSuchElementException nsee) { /* Success case */
         }
     }
 
@@ -126,12 +125,12 @@
      */
     @Test
     public void testEmptyBounded() {
-        Iterator<E> iter = new BoundedIterator<E>(testList.iterator(), 3, 0);
+        final Iterator<E> iter = new BoundedIterator<>(testList.iterator(), 3, 0);
         assertFalse(iter.hasNext());
         try {
             iter.next();
             fail("Expected NoSuchElementException.");
-        } catch (NoSuchElementException nsee) { /* Success case */
+        } catch (final NoSuchElementException nsee) { /* Success case */
         }
     }
 
@@ -142,9 +141,9 @@
     @Test
     public void testNegativeOffset() {
         try {
-            new BoundedIterator<E>(testList.iterator(), -1, 4);
+            new BoundedIterator<>(testList.iterator(), -1, 4);
             fail("Expected IllegalArgumentException.");
-        } catch (IllegalArgumentException iae) { /* Success case */
+        } catch (final IllegalArgumentException iae) { /* Success case */
         }
     }
 
@@ -155,9 +154,9 @@
     @Test
     public void testNegativeMax() {
         try {
-            new BoundedIterator<E>(testList.iterator(), 3, -1);
+            new BoundedIterator<>(testList.iterator(), 3, -1);
             fail("Expected IllegalArgumentException.");
-        } catch (IllegalArgumentException iae) { /* Success case */
+        } catch (final IllegalArgumentException iae) { /* Success case */
         }
     }
 
@@ -168,12 +167,12 @@
      */
     @Test
     public void testOffsetGreaterThanSize() {
-        Iterator<E> iter = new BoundedIterator<E>(testList.iterator(), 10, 4);
+        final Iterator<E> iter = new BoundedIterator<>(testList.iterator(), 10, 4);
         assertFalse(iter.hasNext());
         try {
             iter.next();
             fail("Expected NoSuchElementException.");
-        } catch (NoSuchElementException nsee) { /* Success case */
+        } catch (final NoSuchElementException nsee) { /* Success case */
         }
     }
 
@@ -185,7 +184,7 @@
      */
     @Test
     public void testMaxGreaterThanSize() {
-        Iterator<E> iter = new BoundedIterator<E>(testList.iterator(), 1, 10);
+        final Iterator<E> iter = new BoundedIterator<>(testList.iterator(), 1, 10);
 
         assertTrue(iter.hasNext());
         assertEquals("b", iter.next());
@@ -204,7 +203,7 @@
         try {
             iter.next();
             fail("Expected NoSuchElementException.");
-        } catch (NoSuchElementException nsee) { /* Success case */
+        } catch (final NoSuchElementException nsee) { /* Success case */
         }
     }
 
@@ -214,13 +213,13 @@
      */
     @Test
     public void testRemoveWithoutCallingNext() {
-        List<E> testListCopy = new ArrayList<E>(testList);
-        Iterator<E> iter = new BoundedIterator<E>(testListCopy.iterator(), 1, 5);
+        final List<E> testListCopy = new ArrayList<>(testList);
+        final Iterator<E> iter = new BoundedIterator<>(testListCopy.iterator(), 1, 5);
 
         try {
             iter.remove();
             fail("Expected IllegalStateException.");
-        } catch (IllegalStateException ise) { /* Success case */
+        } catch (final IllegalStateException ise) { /* Success case */
         }
     }
 
@@ -230,8 +229,8 @@
      */
     @Test
     public void testRemoveCalledTwice() {
-        List<E> testListCopy = new ArrayList<E>(testList);
-        Iterator<E> iter = new BoundedIterator<E>(testListCopy.iterator(), 1, 5);
+        final List<E> testListCopy = new ArrayList<>(testList);
+        final Iterator<E> iter = new BoundedIterator<>(testListCopy.iterator(), 1, 5);
 
         assertTrue(iter.hasNext());
         assertEquals("b", iter.next());
@@ -240,7 +239,7 @@
         try {
             iter.remove();
             fail("Expected IllegalStateException.");
-        } catch (IllegalStateException ise) { /* Success case */
+        } catch (final IllegalStateException ise) { /* Success case */
         }
     }
 
@@ -250,8 +249,8 @@
      */
     @Test
     public void testRemoveFirst() {
-        List<E> testListCopy = new ArrayList<E>(testList);
-        Iterator<E> iter = new BoundedIterator<E>(testListCopy.iterator(), 1, 5);
+        final List<E> testListCopy = new ArrayList<>(testList);
+        final Iterator<E> iter = new BoundedIterator<>(testListCopy.iterator(), 1, 5);
 
         assertTrue(iter.hasNext());
         assertEquals("b", iter.next());
@@ -272,7 +271,7 @@
         try {
             iter.next();
             fail("Expected NoSuchElementException.");
-        } catch (NoSuchElementException nsee) { /* Success case */
+        } catch (final NoSuchElementException nsee) { /* Success case */
         }
     }
 
@@ -282,8 +281,8 @@
      */
     @Test
     public void testRemoveMiddle() {
-        List<E> testListCopy = new ArrayList<E>(testList);
-        Iterator<E> iter = new BoundedIterator<E>(testListCopy.iterator(), 1, 5);
+        final List<E> testListCopy = new ArrayList<>(testList);
+        final Iterator<E> iter = new BoundedIterator<>(testListCopy.iterator(), 1, 5);
 
         assertTrue(iter.hasNext());
         assertEquals("b", iter.next());
@@ -304,7 +303,7 @@
         try {
             iter.next();
             fail("Expected NoSuchElementException.");
-        } catch (NoSuchElementException nsee) { /* Success case */
+        } catch (final NoSuchElementException nsee) { /* Success case */
         }
     }
 
@@ -314,8 +313,8 @@
      */
     @Test
     public void testRemoveLast() {
-        List<E> testListCopy = new ArrayList<E>(testList);
-        Iterator<E> iter = new BoundedIterator<E>(testListCopy.iterator(), 1, 5);
+        final List<E> testListCopy = new ArrayList<>(testList);
+        final Iterator<E> iter = new BoundedIterator<>(testListCopy.iterator(), 1, 5);
 
         assertTrue(iter.hasNext());
         assertEquals("b", iter.next());
@@ -332,7 +331,7 @@
         try {
             iter.next();
             fail("Expected NoSuchElementException.");
-        } catch (NoSuchElementException nsee) { /* Success case */
+        } catch (final NoSuchElementException nsee) { /* Success case */
         }
 
         iter.remove();
@@ -342,7 +341,7 @@
         try {
             iter.next();
             fail("Expected NoSuchElementException.");
-        } catch (NoSuchElementException nsee) { /* Success case */
+        } catch (final NoSuchElementException nsee) { /* Success case */
         }
     }
 
@@ -352,19 +351,20 @@
      */
     @Test
     public void testRemoveUnsupported() {
-        Iterator<E> mockIterator = new AbstractIteratorDecorator<E>(testList.iterator()) {
+        final Iterator<E> mockIterator = new AbstractIteratorDecorator<E>(testList.iterator()) {
+            @Override
             public void remove() {
                 throw new UnsupportedOperationException();
             }
         };
 
-        Iterator<E> iter = new BoundedIterator<E>(mockIterator, 1, 5);
+        final Iterator<E> iter = new BoundedIterator<>(mockIterator, 1, 5);
         assertTrue(iter.hasNext());
         assertEquals("b", iter.next());
         try {
             iter.remove();
             fail("Expected UnsupportedOperationException.");
-        } catch (UnsupportedOperationException usoe) { /* Success case */
+        } catch (final UnsupportedOperationException usoe) { /* Success case */
         }
     }
 }
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/CollatingIteratorTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/CollatingIteratorTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/CollatingIteratorTest.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/CollatingIteratorTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -26,7 +26,6 @@
 /**
  * Unit test suite for {@link CollatingIterator}.
  *
- * @version $Id: CollatingIteratorTest.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 @SuppressWarnings("boxing")
 public class CollatingIteratorTest extends AbstractIteratorTest<Integer> {
@@ -47,9 +46,9 @@
     @Override
     public void setUp() throws Exception {
         super.setUp();
-        comparator = new ComparableComparator<Integer>();
-        evens = new ArrayList<Integer>();
-        odds = new ArrayList<Integer>();
+        comparator = new ComparableComparator<>();
+        evens = new ArrayList<>();
+        odds = new ArrayList<>();
         for (int i = 0; i < 20; i++) {
             if (0 == i % 2) {
                 evens.add(i);
@@ -57,7 +56,7 @@
                 odds.add(i);
             }
         }
-        fib = new ArrayList<Integer>();
+        fib = new ArrayList<>();
         fib.add(1);
         fib.add(1);
         fib.add(2);
@@ -72,12 +71,12 @@
 
     @Override
     public CollatingIterator<Integer> makeEmptyIterator() {
-        return new CollatingIterator<Integer>(comparator);
+        return new CollatingIterator<>(comparator);
     }
 
     @Override
     public CollatingIterator<Integer> makeObject() {
-        final CollatingIterator<Integer> iter = new CollatingIterator<Integer>(comparator);
+        final CollatingIterator<Integer> iter = new CollatingIterator<>(comparator);
         iter.addIterator(evens.iterator());
         iter.addIterator(odds.iterator());
         iter.addIterator(fib.iterator());
@@ -87,7 +86,7 @@
     //------------------------------------------------------------------- Tests
 
     public void testGetSetComparator() {
-        final CollatingIterator<Integer> iter = new CollatingIterator<Integer>();
+        final CollatingIterator<Integer> iter = new CollatingIterator<>();
         assertNull(iter.getComparator());
         iter.setComparator(comparator);
         assertSame(comparator, iter.getComparator());
@@ -96,7 +95,7 @@
     }
 
     public void testIterateEven() {
-        final CollatingIterator<Integer> iter = new CollatingIterator<Integer>(comparator);
+        final CollatingIterator<Integer> iter = new CollatingIterator<>(comparator);
         iter.addIterator(evens.iterator());
         for (int i = 0; i < evens.size(); i++) {
             assertTrue(iter.hasNext());
@@ -107,7 +106,7 @@
     }
 
     public void testIterateEvenOdd() {
-        final CollatingIterator<Integer> iter = new CollatingIterator<Integer>(comparator, evens.iterator(), odds.iterator());
+        final CollatingIterator<Integer> iter = new CollatingIterator<>(comparator, evens.iterator(), odds.iterator());
         for (int i = 0; i < 20; i++) {
             assertTrue(iter.hasNext());
             assertEquals(Integer.valueOf(i), iter.next());
@@ -117,7 +116,7 @@
     }
 
     public void testIterateOddEven() {
-        final CollatingIterator<Integer> iter = new CollatingIterator<Integer>(comparator, odds.iterator(), evens.iterator());
+        final CollatingIterator<Integer> iter = new CollatingIterator<>(comparator, odds.iterator(), evens.iterator());
         for (int i = 0; i < 20; i++) {
             assertTrue(iter.hasNext());
             assertEquals(Integer.valueOf(i),iter.next());
@@ -127,7 +126,7 @@
     }
 
     public void testIterateEvenEven() {
-        final CollatingIterator<Integer> iter = new CollatingIterator<Integer>(comparator);
+        final CollatingIterator<Integer> iter = new CollatingIterator<>(comparator);
         iter.addIterator(evens.iterator());
         iter.addIterator(evens.iterator());
         for (int i = 0; i < evens.size(); i++) {
@@ -142,7 +141,7 @@
     }
 
     public void testIterateFibEvenOdd() {
-        final CollatingIterator<Integer> iter = new CollatingIterator<Integer>(comparator);
+        final CollatingIterator<Integer> iter = new CollatingIterator<>(comparator);
         iter.addIterator(fib.iterator());
         iter.addIterator(evens.iterator());
         iter.addIterator(odds.iterator());
@@ -208,7 +207,7 @@
     }
 
     public void testRemoveFromSingle() {
-        final CollatingIterator<Integer> iter = new CollatingIterator<Integer>(comparator);
+        final CollatingIterator<Integer> iter = new CollatingIterator<>(comparator);
         iter.addIterator(evens.iterator());
         int expectedSize = evens.size();
         while (iter.hasNext()) {
@@ -223,7 +222,7 @@
     }
 
     public void testRemoveFromDouble() {
-        final CollatingIterator<Integer> iter = new CollatingIterator<Integer>(comparator);
+        final CollatingIterator<Integer> iter = new CollatingIterator<>(comparator);
         iter.addIterator(evens.iterator());
         iter.addIterator(odds.iterator());
         int expectedSize = evens.size() + odds.size();
@@ -242,7 +241,7 @@
        final List<Integer> l1 = Arrays.asList(1, 3, 5);
        final List<Integer> l2 = Arrays.asList(2, 4, 6);
 
-       final CollatingIterator<Integer> collatingIterator1 = new CollatingIterator<Integer>(null, l1.iterator(), l2.iterator());
+       final CollatingIterator<Integer> collatingIterator1 = new CollatingIterator<>(null, l1.iterator(), l2.iterator());
        try {
            collatingIterator1.next();
        } catch (final NullPointerException e) {
@@ -250,7 +249,7 @@
        }
 
        int i = 0;
-       final CollatingIterator<Integer> collatingIterator2 = new CollatingIterator<Integer>(null, l1.iterator(), l2.iterator());
+       final CollatingIterator<Integer> collatingIterator2 = new CollatingIterator<>(null, l1.iterator(), l2.iterator());
        collatingIterator2.setComparator(new ComparableComparator<Integer>());
        for ( ; collatingIterator2.hasNext(); i++ ) {
           final Integer n = collatingIterator2.next();
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/FilterIteratorTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/FilterIteratorTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/FilterIteratorTest.java	2013-11-13 21:14:15.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/FilterIteratorTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -31,7 +31,6 @@
 /**
  * Test the filter iterator.
  *
- * @version $Id: FilterIteratorTest.java 1541722 2013-11-13 21:14:15Z tn $
  */
 public class FilterIteratorTest<E> extends AbstractIteratorTest<E> {
 
@@ -75,13 +74,13 @@
     /**
      * Returns an array with elements wrapped in a pass-through
      * FilterIterator
-     * 
+     *
      * @return a filtered iterator
      */
     @Override
     @SuppressWarnings("unchecked")
     public FilterIterator<E> makeObject() {
-        list = new ArrayList<E>(Arrays.asList((E[]) array));
+        list = new ArrayList<>(Arrays.asList((E[]) array));
         return makePassThroughFilter(list.iterator());
     }
 
@@ -119,7 +118,7 @@
         final Iterator<E> iter1 = Collections.singleton((E) new Object()).iterator();
         final Iterator<E> iter2 = Collections.<E>emptyList().iterator();
 
-        final FilterIterator<E> filterIterator = new FilterIterator<E>(iter1);
+        final FilterIterator<E> filterIterator = new FilterIterator<>(iter1);
         filterIterator.setPredicate(truePredicate());
         // this iterator has elements
         assertEquals(true, filterIterator.hasNext());
@@ -136,7 +135,7 @@
     public void testSetPredicate() {
         final Iterator<E> iter = Collections.singleton((E) null).iterator();
 
-        final FilterIterator<E> filterIterator = new FilterIterator<E>(iter);
+        final FilterIterator<E> filterIterator = new FilterIterator<>(iter);
         filterIterator.setPredicate(truePredicate());
         // this predicate matches
         assertEquals(true, filterIterator.hasNext());
@@ -159,6 +158,7 @@
 
     private void verifyElementsInPredicate(final String[] elements) {
         final Predicate<E> pred = new Predicate<E>() {
+            @Override
             public boolean evaluate(final E x) {
                 for (final String element : elements) {
                     if (element.equals(x)) {
@@ -200,9 +200,10 @@
      */
     protected FilterIterator<E> makePassThroughFilter(final Iterator<E> i) {
         final Predicate<E> pred = new Predicate<E>() {
+                @Override
                 public boolean evaluate(final E x) { return true; }
         };
-        return new FilterIterator<E>(i, pred);
+        return new FilterIterator<>(i, pred);
     }
 
     /**
@@ -214,9 +215,10 @@
      */
     protected FilterIterator<E> makeBlockAllFilter(final Iterator<E> i) {
         final Predicate<E> pred = new Predicate<E>() {
+                @Override
                 public boolean evaluate(final E x) { return false; }
         };
-        return new FilterIterator<E>(i, pred);
+        return new FilterIterator<>(i, pred);
     }
 }
 
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/FilterListIteratorTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/FilterListIteratorTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/FilterListIteratorTest.java	2013-11-11 13:22:32.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/FilterListIteratorTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -22,19 +22,22 @@
 import java.util.ListIterator;
 import java.util.Random;
 
-import junit.framework.TestCase;
 import org.apache.commons.collections4.Predicate;
 import org.apache.commons.collections4.PredicateUtils;
 import org.apache.commons.collections4.list.GrowthList;
+import org.junit.After;
 import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
 
 /**
  * Tests the FilterListIterator class.
  *
- * @version $Id: FilterListIteratorTest.java 1540705 2013-11-11 13:22:32Z ebourg $
  */
 @SuppressWarnings("boxing")
-public class FilterListIteratorTest extends TestCase {
+public class FilterListIteratorTest {
 
     private ArrayList<Integer> list = null;
     private ArrayList<Integer> odds = null;
@@ -50,14 +53,14 @@
     private Predicate<Integer> fourPred = null;
     private final Random random = new Random();
 
-    @Override
+    @Before
     public void setUp() {
-        list = new ArrayList<Integer>();
-        odds = new ArrayList<Integer>();
-        evens = new ArrayList<Integer>();
-        threes = new ArrayList<Integer>();
-        fours = new ArrayList<Integer>();
-        sixes = new ArrayList<Integer>();
+        list = new ArrayList<>();
+        odds = new ArrayList<>();
+        evens = new ArrayList<>();
+        threes = new ArrayList<>();
+        fours = new ArrayList<>();
+        sixes = new ArrayList<>();
         for (int i = 0; i < 20; i++) {
             list.add(Integer.valueOf(i));
             if (i % 2 == 0) { evens.add(Integer.valueOf(i)); }
@@ -68,36 +71,42 @@
         }
 
         truePred = new Predicate<Integer>() {
+            @Override
             public boolean evaluate(final Integer x) {
                 return true;
             }
         };
 
         falsePred = new Predicate<Integer>() {
+            @Override
             public boolean evaluate(final Integer x) {
                 return true;
             }
         };
 
         evenPred = new Predicate<Integer>() {
+            @Override
             public boolean evaluate(final Integer x) {
                 return x % 2 == 0;
             }
         };
 
         oddPred = new Predicate<Integer>() {
+            @Override
             public boolean evaluate(final Integer x) {
                 return x % 2 != 0; //works for all numbers, not just >= 0 as is the case for "x % 2 == 1"
             }
         };
 
         threePred = new Predicate<Integer>() {
+            @Override
             public boolean evaluate(final Integer x) {
                 return x % 3 == 0;
             }
         };
 
         fourPred = new Predicate<Integer>() {
+            @Override
             public boolean evaluate(final Integer x) {
                 return x % 4 == 0;
             }
@@ -105,7 +114,7 @@
 
     }
 
-    @Override
+    @After
     public void tearDown() throws Exception {
         list = null;
         odds = null;
@@ -121,14 +130,16 @@
         fourPred = null;
     }
 
+    @Test
     public void testWalkLists() {
         // this just confirms that our walkLists method works OK
         walkLists(list,list.listIterator());
     }
 
+    @Test
     public void testManual() {
         // do this one "by hand" as a sanity check
-        final FilterListIterator<Integer> filtered = new FilterListIterator<Integer>(list.listIterator(), threePred);
+        final FilterListIterator<Integer> filtered = new FilterListIterator<>(list.listIterator(), threePred);
 
         assertEquals(Integer.valueOf(0), filtered.next());
         assertEquals(Integer.valueOf(3), filtered.next());
@@ -185,89 +196,101 @@
         assertEquals(Integer.valueOf(9), filtered.previous());
     }
 
+    @Test
     public void testTruePredicate() {
-        final FilterListIterator<Integer> filtered = new FilterListIterator<Integer>(list.listIterator(), truePred);
+        final FilterListIterator<Integer> filtered = new FilterListIterator<>(list.listIterator(), truePred);
         walkLists(list, filtered);
     }
 
+    @Test
     public void testFalsePredicate() {
-        final FilterListIterator<Integer> filtered = new FilterListIterator<Integer>(list.listIterator(), falsePred);
+        final FilterListIterator<Integer> filtered = new FilterListIterator<>(list.listIterator(), falsePred);
         walkLists(new ArrayList<Integer>(), filtered);
     }
 
+    @Test
     public void testEvens() {
-        final FilterListIterator<Integer> filtered = new FilterListIterator<Integer>(list.listIterator(), evenPred);
+        final FilterListIterator<Integer> filtered = new FilterListIterator<>(list.listIterator(), evenPred);
         walkLists(evens, filtered);
     }
 
+    @Test
     public void testOdds() {
-        final FilterListIterator<Integer> filtered = new FilterListIterator<Integer>(list.listIterator(), oddPred);
+        final FilterListIterator<Integer> filtered = new FilterListIterator<>(list.listIterator(), oddPred);
         walkLists(odds, filtered);
     }
 
+    @Test
     public void testThrees() {
-        final FilterListIterator<Integer> filtered = new FilterListIterator<Integer>(list.listIterator(), threePred);
+        final FilterListIterator<Integer> filtered = new FilterListIterator<>(list.listIterator(), threePred);
         walkLists(threes, filtered);
     }
 
+    @Test
     public void testFours() {
-        final FilterListIterator<Integer> filtered = new FilterListIterator<Integer>(list.listIterator(), fourPred);
+        final FilterListIterator<Integer> filtered = new FilterListIterator<>(list.listIterator(), fourPred);
         walkLists(fours, filtered);
     }
 
+    @Test
     public void testNestedSixes() {
-        final FilterListIterator<Integer> filtered = new FilterListIterator<Integer>(
-                                        new FilterListIterator<Integer>(list.listIterator(), threePred),
+        final FilterListIterator<Integer> filtered = new FilterListIterator<>(
+                                        new FilterListIterator<>(list.listIterator(), threePred),
                                         evenPred
                                       );
         walkLists(sixes, filtered);
     }
 
+    @Test
     public void testNestedSixes2() {
-        final FilterListIterator<Integer> filtered = new FilterListIterator<Integer>(
-                                        new FilterListIterator<Integer>(list.listIterator(), evenPred),
+        final FilterListIterator<Integer> filtered = new FilterListIterator<>(
+                                        new FilterListIterator<>(list.listIterator(), evenPred),
                                         threePred
                                       );
         walkLists(sixes, filtered);
     }
 
+    @Test
     public void testNestedSixes3() {
-        final FilterListIterator<Integer> filtered = new FilterListIterator<Integer>(
-                                        new FilterListIterator<Integer>(list.listIterator(), threePred),
+        final FilterListIterator<Integer> filtered = new FilterListIterator<>(
+                                        new FilterListIterator<>(list.listIterator(), threePred),
                                         evenPred
                                       );
-        walkLists(sixes, new FilterListIterator<Integer>(filtered, truePred));
+        walkLists(sixes, new FilterListIterator<>(filtered, truePred));
     }
 
+    @Test
     public void testNextChangesPrevious() {
         {
-            final FilterListIterator<Integer> filtered = new FilterListIterator<Integer>(list.listIterator(), threePred);
+            final FilterListIterator<Integer> filtered = new FilterListIterator<>(list.listIterator(), threePred);
             nextNextPrevious(threes.listIterator(), filtered);
         }
 
         {
-            final FilterListIterator<Integer> filtered = new FilterListIterator<Integer>(list.listIterator(), truePred);
+            final FilterListIterator<Integer> filtered = new FilterListIterator<>(list.listIterator(), truePred);
             nextNextPrevious(list.listIterator(), filtered);
         }
     }
 
+    @Test
     public void testPreviousChangesNext() {
         {
-            final FilterListIterator<Integer> filtered = new FilterListIterator<Integer>(list.listIterator(), threePred);
+            final FilterListIterator<Integer> filtered = new FilterListIterator<>(list.listIterator(), threePred);
             final ListIterator<Integer> expected = threes.listIterator();
             walkForward(expected,filtered);
             previousPreviousNext(expected,filtered);
         }
         {
-            final FilterListIterator<Integer> filtered = new FilterListIterator<Integer>(list.listIterator(), truePred);
+            final FilterListIterator<Integer> filtered = new FilterListIterator<>(list.listIterator(), truePred);
             final ListIterator<Integer> expected = list.listIterator();
             walkForward(expected, filtered);
             previousPreviousNext(expected, filtered);
         }
     }
 
+    @Test
     public void testFailingHasNextBug() {
-        final FilterListIterator<Integer> filtered = new FilterListIterator<Integer>(list.listIterator(), fourPred);
+        final FilterListIterator<Integer> filtered = new FilterListIterator<>(list.listIterator(), fourPred);
         final ListIterator<Integer> expected = fours.listIterator();
         while (expected.hasNext()) {
             expected.next();
@@ -281,12 +304,13 @@
     /**
      * Test for {@link "https://issues.apache.org/jira/browse/COLLECTIONS-360 COLLECTIONS-360"}
      */
+    @Test
     public void testCollections360() throws Throwable {
-        final Collection<Predicate<Object>> var7 = new GrowthList<Predicate<Object>>();
+        final Collection<Predicate<Object>> var7 = new GrowthList<>();
         final Predicate<Object> var9 = PredicateUtils.anyPredicate(var7);
-        final FilterListIterator<Object> var13 = new FilterListIterator<Object>(var9);
+        final FilterListIterator<Object> var13 = new FilterListIterator<>(var9);
         Assert.assertFalse(var13.hasNext());
-        final FilterListIterator<Object> var14 = new FilterListIterator<Object>(var9);
+        final FilterListIterator<Object> var14 = new FilterListIterator<>(var9);
         Assert.assertFalse(var14.hasPrevious());
     }
 
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/IteratorChainTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/IteratorChainTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/IteratorChainTest.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/IteratorChainTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -27,7 +27,6 @@
 /**
  * Tests the IteratorChain class.
  *
- * @version $Id: IteratorChainTest.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 public class IteratorChainTest extends AbstractIteratorTest<String> {
 
@@ -45,26 +44,26 @@
 
     @Override
     public void setUp() {
-        list1 = new ArrayList<String>();
+        list1 = new ArrayList<>();
         list1.add("One");
         list1.add("Two");
         list1.add("Three");
-        list2 = new ArrayList<String>();
+        list2 = new ArrayList<>();
         list2.add("Four");
-        list3 = new ArrayList<String>();
+        list3 = new ArrayList<>();
         list3.add("Five");
         list3.add("Six");
     }
 
     @Override
     public IteratorChain<String> makeEmptyIterator() {
-        final ArrayList<String> list = new ArrayList<String>();
-        return new IteratorChain<String>(list.iterator());
+        final ArrayList<String> list = new ArrayList<>();
+        return new IteratorChain<>(list.iterator());
     }
 
     @Override
     public IteratorChain<String> makeObject() {
-        final IteratorChain<String> chain = new IteratorChain<String>();
+        final IteratorChain<String> chain = new IteratorChain<>();
 
         chain.addIterator(list1.iterator());
         chain.addIterator(list2.iterator());
@@ -93,13 +92,14 @@
     public void testRemoveFromFilteredIterator() {
 
         final Predicate<Integer> myPredicate = new Predicate<Integer>() {
+            @Override
             public boolean evaluate(final Integer i) {
                 return i.compareTo(Integer.valueOf(4)) < 0;
             }
         };
 
-        final List<Integer> list1 = new ArrayList<Integer>();
-        final List<Integer> list2 = new ArrayList<Integer>();
+        final List<Integer> list1 = new ArrayList<>();
+        final List<Integer> list2 = new ArrayList<>();
 
         list1.add(Integer.valueOf(1));
         list1.add(Integer.valueOf(2));
@@ -145,12 +145,12 @@
     }
 
     public void testFirstIteratorIsEmptyBug() {
-        final List<String> empty = new ArrayList<String>();
-        final List<String> notEmpty = new ArrayList<String>();
+        final List<String> empty = new ArrayList<>();
+        final List<String> notEmpty = new ArrayList<>();
         notEmpty.add("A");
         notEmpty.add("B");
         notEmpty.add("C");
-        final IteratorChain<String> chain = new IteratorChain<String>();
+        final IteratorChain<String> chain = new IteratorChain<>();
         chain.addIterator(empty.iterator());
         chain.addIterator(notEmpty.iterator());
         assertTrue("should have next",chain.hasNext());
@@ -163,7 +163,7 @@
     }
 
     public void testEmptyChain() {
-        final IteratorChain<Object> chain = new IteratorChain<Object>();
+        final IteratorChain<Object> chain = new IteratorChain<>();
         assertEquals(false, chain.hasNext());
         try {
             chain.next();
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/IteratorEnumerationTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/IteratorEnumerationTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/IteratorEnumerationTest.java	2013-11-20 07:51:32.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/IteratorEnumerationTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -21,21 +21,22 @@
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.*;
 
 /**
  * Tests the IteratorEnumeration.
- * 
- * @version $Id: IteratorEnumerationTest.java 1543728 2013-11-20 07:51:32Z ebourg $
+ *
  */
-public class IteratorEnumerationTest extends TestCase {
-    
+public class IteratorEnumerationTest {
+
+    @Test
     public void testEnumeration() {
-        Iterator<String> iterator = Arrays.asList("a", "b", "c").iterator();
-        IteratorEnumeration<String> enumeration = new IteratorEnumeration<String>(iterator);
-        
+        final Iterator<String> iterator = Arrays.asList("a", "b", "c").iterator();
+        final IteratorEnumeration<String> enumeration = new IteratorEnumeration<>(iterator);
+
         assertEquals(iterator, enumeration.getIterator());
-        
+
         assertTrue(enumeration.hasMoreElements());
         assertEquals("a", enumeration.nextElement());
         assertEquals("b", enumeration.nextElement());
@@ -45,7 +46,7 @@
         try {
             enumeration.nextElement();
             fail("NoSuchElementException expected");
-        } catch (NoSuchElementException e) {
+        } catch (final NoSuchElementException e) {
             // expected
         }
     }
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/IteratorIterableTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/IteratorIterableTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/IteratorIterableTest.java	2013-11-13 21:14:15.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/IteratorIterableTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -24,7 +24,6 @@
 /**
  * Tests for IteratorIterable.
  *
- * @version $Id: IteratorIterableTest.java 1541722 2013-11-13 21:14:15Z tn $
  */
 public class IteratorIterableTest extends BulkTest {
 
@@ -37,7 +36,7 @@
     }
 
     private Iterator<Integer> createIterator() {
-        final List<Integer> list = new ArrayList<Integer>();
+        final List<Integer> list = new ArrayList<>();
         list.add(Integer.valueOf(0));
         list.add(Integer.valueOf(1));
         list.add(Integer.valueOf(2));
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/LazyIteratorChainTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/LazyIteratorChainTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/LazyIteratorChainTest.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/LazyIteratorChainTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -27,7 +27,6 @@
 /**
  * Tests the LazyIteratorChain class.
  *
- * @version $Id: LazyIteratorChainTest.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 public class LazyIteratorChainTest extends AbstractIteratorTest<String> {
 
@@ -45,13 +44,13 @@
 
     @Override
     public void setUp() {
-        list1 = new ArrayList<String>();
+        list1 = new ArrayList<>();
         list1.add("One");
         list1.add("Two");
         list1.add("Three");
-        list2 = new ArrayList<String>();
+        list2 = new ArrayList<>();
         list2.add("Four");
-        list3 = new ArrayList<String>();
+        list3 = new ArrayList<>();
         list3.add("Five");
         list3.add("Six");
     }
@@ -107,13 +106,14 @@
     public void testRemoveFromFilteredIterator() {
 
         final Predicate<Integer> myPredicate = new Predicate<Integer>() {
+            @Override
             public boolean evaluate(final Integer i) {
                 return i.compareTo(Integer.valueOf(4)) < 0;
             }
         };
 
-        final List<Integer> list1 = new ArrayList<Integer>();
-        final List<Integer> list2 = new ArrayList<Integer>();
+        final List<Integer> list1 = new ArrayList<>();
+        final List<Integer> list2 = new ArrayList<>();
 
         list1.add(Integer.valueOf(1));
         list1.add(Integer.valueOf(2));
@@ -159,8 +159,8 @@
     }
 
     public void testFirstIteratorIsEmptyBug() {
-        final List<String> empty = new ArrayList<String>();
-        final List<String> notEmpty = new ArrayList<String>();
+        final List<String> empty = new ArrayList<>();
+        final List<String> notEmpty = new ArrayList<>();
         notEmpty.add("A");
         notEmpty.add("B");
         notEmpty.add("C");
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapper2Test.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapper2Test.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapper2Test.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapper2Test.java	2018-07-08 00:18:18.000000000 +0000
@@ -26,7 +26,6 @@
 /**
  * Tests the ListIteratorWrapper to insure that it behaves as expected when wrapping a ListIterator.
  *
- * @version $Id: ListIteratorWrapper2Test.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 public class ListIteratorWrapper2Test<E> extends AbstractIteratorTest<E> {
 
@@ -43,7 +42,7 @@
     @Override
     @SuppressWarnings("unchecked")
     public void setUp() {
-        list1 = new ArrayList<E>();
+        list1 = new ArrayList<>();
         list1.add((E) "One");
         list1.add((E) "Two");
         list1.add((E) "Three");
@@ -54,13 +53,13 @@
 
     @Override
     public ResettableListIterator<E> makeEmptyIterator() {
-        final ArrayList<E> list = new ArrayList<E>();
-        return new ListIteratorWrapper<E>(list.listIterator());
+        final ArrayList<E> list = new ArrayList<>();
+        return new ListIteratorWrapper<>(list.listIterator());
     }
 
     @Override
     public ResettableListIterator<E> makeObject() {
-        return new ListIteratorWrapper<E>(list1.listIterator());
+        return new ListIteratorWrapper<>(list1.listIterator());
     }
 
     public void testIterator() {
@@ -136,7 +135,7 @@
         //like we never started iterating:
         assertEquals(-1, iter.previousIndex());
         assertEquals(0, iter.nextIndex());
- 
+
         try {
             iter.remove();
             fail("ListIteratorWrapper#remove() should fail; must be repositioned first");
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapperTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapperTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapperTest.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/ListIteratorWrapperTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -27,7 +27,6 @@
  * Tests the ListIteratorWrapper to insure that it simulates
  * a ListIterator correctly.
  *
- * @version $Id: ListIteratorWrapperTest.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 public class ListIteratorWrapperTest<E> extends AbstractIteratorTest<E> {
 
@@ -44,7 +43,7 @@
     @Override
     @SuppressWarnings("unchecked")
     public void setUp() {
-        list1 = new ArrayList<E>();
+        list1 = new ArrayList<>();
         list1.add((E) "One");
         list1.add((E) "Two");
         list1.add((E) "Three");
@@ -55,13 +54,13 @@
 
     @Override
     public ResettableListIterator<E> makeEmptyIterator() {
-        final ArrayList<E> list = new ArrayList<E>();
-        return new ListIteratorWrapper<E>(list.iterator());
+        final ArrayList<E> list = new ArrayList<>();
+        return new ListIteratorWrapper<>(list.iterator());
     }
 
     @Override
     public ResettableListIterator<E> makeObject() {
-        return new ListIteratorWrapper<E>(list1.iterator());
+        return new ListIteratorWrapper<>(list1.iterator());
     }
 
     public void testIterator() {
@@ -137,7 +136,7 @@
         //like we never started iterating:
         assertEquals(-1, iter.previousIndex());
         assertEquals(0, iter.nextIndex());
- 
+
         try {
             iter.remove();
             fail("ListIteratorWrapper#remove() should fail; must be repositioned first");
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/LoopingIteratorTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/LoopingIteratorTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/LoopingIteratorTest.java	2013-11-11 21:58:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/LoopingIteratorTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -21,21 +21,23 @@
 import java.util.List;
 import java.util.NoSuchElementException;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
 
 /**
  * Tests the LoopingIterator class.
  *
- * @version $Id: LoopingIteratorTest.java 1540860 2013-11-11 21:58:27Z ebourg $
  */
-public class LoopingIteratorTest extends TestCase {
+public class LoopingIteratorTest {
 
     /**
      * Tests constructor exception.
      */
+    @Test
     public void testConstructorEx() throws Exception {
         try {
-            new LoopingIterator<Object>(null);
+            new LoopingIterator<>(null);
             fail();
         } catch (final NullPointerException ex) {
         }
@@ -45,9 +47,10 @@
      * Tests whether an empty looping iterator works as designed.
      * @throws Exception  If something unexpected occurs.
      */
+    @Test
     public void testLooping0() throws Exception {
-        final List<Object> list = new ArrayList<Object>();
-        final LoopingIterator<Object> loop = new LoopingIterator<Object>(list);
+        final List<Object> list = new ArrayList<>();
+        final LoopingIterator<Object> loop = new LoopingIterator<>(list);
         assertTrue("hasNext should return false", !loop.hasNext());
 
         try {
@@ -61,9 +64,10 @@
      * Tests whether a populated looping iterator works as designed.
      * @throws Exception  If something unexpected occurs.
      */
+    @Test
     public void testLooping1() throws Exception {
         final List<String> list = Arrays.asList("a");
-        final LoopingIterator<String> loop = new LoopingIterator<String>(list);
+        final LoopingIterator<String> loop = new LoopingIterator<>(list);
 
         assertTrue("1st hasNext should return true", loop.hasNext());
         assertEquals("a", loop.next());
@@ -80,9 +84,10 @@
      * Tests whether a populated looping iterator works as designed.
      * @throws Exception  If something unexpected occurs.
      */
+    @Test
     public void testLooping2() throws Exception {
         final List<String> list = Arrays.asList("a", "b");
-        final LoopingIterator<String> loop = new LoopingIterator<String>(list);
+        final LoopingIterator<String> loop = new LoopingIterator<>(list);
 
         assertTrue("1st hasNext should return true", loop.hasNext());
         assertEquals("a", loop.next());
@@ -99,9 +104,10 @@
      * Tests whether a populated looping iterator works as designed.
      * @throws Exception  If something unexpected occurs.
      */
+    @Test
     public void testLooping3() throws Exception {
         final List<String> list = Arrays.asList("a", "b", "c");
-        final LoopingIterator<String> loop = new LoopingIterator<String>(list);
+        final LoopingIterator<String> loop = new LoopingIterator<>(list);
 
         assertTrue("1st hasNext should return true", loop.hasNext());
         assertEquals("a", loop.next());
@@ -121,9 +127,10 @@
      * Tests the remove() method on a LoopingIterator wrapped ArrayList.
      * @throws Exception  If something unexpected occurs.
      */
+    @Test
     public void testRemoving1() throws Exception {
-        final List<String> list = new ArrayList<String>(Arrays.asList("a", "b", "c"));
-        final LoopingIterator<String> loop = new LoopingIterator<String>(list);
+        final List<String> list = new ArrayList<>(Arrays.asList("a", "b", "c"));
+        final LoopingIterator<String> loop = new LoopingIterator<>(list);
         assertEquals("list should have 3 elements.", 3, list.size());
 
         assertTrue("1st hasNext should return true", loop.hasNext());
@@ -153,9 +160,10 @@
      * Tests the reset() method on a LoopingIterator wrapped ArrayList.
      * @throws Exception  If something unexpected occurs.
      */
+    @Test
     public void testReset() throws Exception {
         final List<String> list = Arrays.asList("a", "b", "c");
-        final LoopingIterator<String> loop = new LoopingIterator<String>(list);
+        final LoopingIterator<String> loop = new LoopingIterator<>(list);
 
         assertEquals("a", loop.next());
         assertEquals("b", loop.next());
@@ -175,9 +183,10 @@
      * Tests the size() method on a LoopingIterator wrapped ArrayList.
      * @throws Exception  If something unexpected occurs.
      */
+    @Test
     public void testSize() throws Exception {
-        final List<String> list = new ArrayList<String>(Arrays.asList("a", "b", "c"));
-        final LoopingIterator<String> loop = new LoopingIterator<String>(list);
+        final List<String> list = new ArrayList<>(Arrays.asList("a", "b", "c"));
+        final LoopingIterator<String> loop = new LoopingIterator<>(list);
 
         assertEquals(3, loop.size());
         loop.next();
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/LoopingListIteratorTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/LoopingListIteratorTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/LoopingListIteratorTest.java	2013-11-11 21:58:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/LoopingListIteratorTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -21,21 +21,22 @@
 import java.util.List;
 import java.util.NoSuchElementException;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.*;
 
 /**
  * Tests the LoopingListIterator class.
  *
- * @version $Id: LoopingListIteratorTest.java 1540860 2013-11-11 21:58:27Z ebourg $
  */
-public class LoopingListIteratorTest extends TestCase {
+public class LoopingListIteratorTest {
 
     /**
      * Tests constructor exception.
      */
+    @Test
     public void testConstructorEx() throws Exception {
         try {
-            new LoopingListIterator<Object>(null);
+            new LoopingListIterator<>(null);
             fail();
         } catch (final NullPointerException ex) {
         }
@@ -44,9 +45,10 @@
     /**
      * Tests whether an empty looping list iterator works.
      */
+    @Test
     public void testLooping0() throws Exception {
-        final List<Object> list = new ArrayList<Object>();
-        final LoopingListIterator<Object> loop = new LoopingListIterator<Object>(list);
+        final List<Object> list = new ArrayList<>();
+        final LoopingListIterator<Object> loop = new LoopingListIterator<>(list);
         assertFalse(loop.hasNext());
         assertFalse(loop.hasPrevious());
 
@@ -67,9 +69,10 @@
      * Tests whether a looping list iterator works on a list with only
      * one element.
      */
+    @Test
     public void testLooping1() throws Exception {
         final List<String> list = Arrays.asList("a");
-        final LoopingListIterator<String> loop = new LoopingListIterator<String>(list); // <a>
+        final LoopingListIterator<String> loop = new LoopingListIterator<>(list); // <a>
 
         assertTrue(loop.hasNext());
         assertEquals("a", loop.next());     // <a>
@@ -94,9 +97,10 @@
      * Tests whether a looping list iterator works on a list with two
      * elements.
      */
+    @Test
     public void testLooping2() throws Exception {
         final List<String> list = Arrays.asList("a", "b");
-        final LoopingListIterator<String> loop = new LoopingListIterator<String>(list); // <a> b
+        final LoopingListIterator<String> loop = new LoopingListIterator<>(list); // <a> b
 
         assertTrue(loop.hasNext());
         assertEquals("a", loop.next());     // a <b>
@@ -124,9 +128,10 @@
      * Tests jogging back and forth between two elements, but not over
      * the begin/end boundary of the list.
      */
+    @Test
     public void testJoggingNotOverBoundary() {
         final List<String> list = Arrays.asList("a", "b");
-        final LoopingListIterator<String> loop = new LoopingListIterator<String>(list); // <a> b
+        final LoopingListIterator<String> loop = new LoopingListIterator<>(list); // <a> b
 
         // Try jogging back and forth between the elements, but not
         // over the begin/end boundary.
@@ -144,9 +149,10 @@
      * Tests jogging back and forth between two elements over the
      * begin/end boundary of the list.
      */
+    @Test
     public void testJoggingOverBoundary() {
         final List<String> list = Arrays.asList("a", "b");
-        final LoopingListIterator<String> loop = new LoopingListIterator<String>(list); // <a> b
+        final LoopingListIterator<String> loop = new LoopingListIterator<>(list); // <a> b
 
         // Try jogging back and forth between the elements, but not
         // over the begin/end boundary.
@@ -162,9 +168,10 @@
     /**
      * Tests removing an element from a wrapped ArrayList.
      */
+    @Test
     public void testRemovingElementsAndIteratingForward() {
-        final List<String> list = new ArrayList<String>(Arrays.asList("a", "b", "c"));
-        final LoopingListIterator<String> loop = new LoopingListIterator<String>(list); // <a> b c
+        final List<String> list = new ArrayList<>(Arrays.asList("a", "b", "c"));
+        final LoopingListIterator<String> loop = new LoopingListIterator<>(list); // <a> b c
 
         assertTrue(loop.hasNext());
         assertEquals("a", loop.next()); // a <b> c
@@ -192,9 +199,10 @@
     /**
      * Tests removing an element from a wrapped ArrayList.
      */
+    @Test
     public void testRemovingElementsAndIteratingBackwards() {
-        final List<String> list = new ArrayList<String>(Arrays.asList("a", "b", "c"));
-        final LoopingListIterator<String> loop = new LoopingListIterator<String>(list); // <a> b c
+        final List<String> list = new ArrayList<>(Arrays.asList("a", "b", "c"));
+        final LoopingListIterator<String> loop = new LoopingListIterator<>(list); // <a> b c
 
         assertTrue(loop.hasPrevious());
         assertEquals("c", loop.previous()); // a b <c>
@@ -222,9 +230,10 @@
     /**
      * Tests the reset method.
      */
+    @Test
     public void testReset() {
         final List<String> list = Arrays.asList("a", "b", "c");
-        final LoopingListIterator<String> loop = new LoopingListIterator<String>(list); // <a> b c
+        final LoopingListIterator<String> loop = new LoopingListIterator<>(list); // <a> b c
 
         assertEquals("a", loop.next()); // a <b> c
         assertEquals("b", loop.next()); // a b <c>
@@ -249,9 +258,10 @@
     /**
      * Tests the add method.
      */
+    @Test
     public void testAdd() {
-        List<String> list = new ArrayList<String>(Arrays.asList("b", "e", "f"));
-        LoopingListIterator<String> loop = new LoopingListIterator<String>(list); // <b> e f
+        List<String> list = new ArrayList<>(Arrays.asList("b", "e", "f"));
+        LoopingListIterator<String> loop = new LoopingListIterator<>(list); // <b> e f
 
         loop.add("a");                      // <a> b e f
         assertEquals("b", loop.next());     // a <b> e f
@@ -275,8 +285,8 @@
         assertEquals("f", loop.next());     // <a> b c d e f
         assertEquals("a", loop.next());     // a <b> c d e f
 
-        list = new ArrayList<String>(Arrays.asList("b", "e", "f"));
-        loop = new LoopingListIterator<String>(list); // <b> e f
+        list = new ArrayList<>(Arrays.asList("b", "e", "f"));
+        loop = new LoopingListIterator<>(list); // <b> e f
 
         loop.add("a");                      // a <b> e f
         assertEquals("a", loop.previous()); // a b e <f>
@@ -303,9 +313,10 @@
     /**
      * Tests nextIndex and previousIndex.
      */
+    @Test
     public void testNextAndPreviousIndex() {
         final List<String> list = Arrays.asList("a", "b", "c");
-        final LoopingListIterator<String> loop = new LoopingListIterator<String>(list); // <a> b c
+        final LoopingListIterator<String> loop = new LoopingListIterator<>(list); // <a> b c
 
         assertEquals(0, loop.nextIndex());
         assertEquals(2, loop.previousIndex());
@@ -334,9 +345,10 @@
     /**
      * Tests using the set method to change elements.
      */
+    @Test
     public void testSet() {
         final List<String> list = Arrays.asList("q", "r", "z");
-        final LoopingListIterator<String> loop = new LoopingListIterator<String>(list); // <q> r z
+        final LoopingListIterator<String> loop = new LoopingListIterator<>(list); // <q> r z
 
         assertEquals("z", loop.previous()); // q r <z>
         loop.set("c");                      // q r <c>
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/NodeListIteratorTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/NodeListIteratorTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/NodeListIteratorTest.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/NodeListIteratorTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -68,9 +68,11 @@
     @Override
     public Iterator<Node> makeEmptyIterator() {
         final NodeList emptyNodeList = new NodeList() {
+            @Override
             public Node item(final int index) {
                 throw new IndexOutOfBoundsException();
             }
+            @Override
             public int getLength() {
                 return 0;
             }
@@ -78,21 +80,22 @@
 
         if (createIteratorWithStandardConstr) {
             return new NodeListIterator(emptyNodeList);
-        } else {
-            final Node parentNode = createMock(Node.class);
-            expect(parentNode.getChildNodes()).andStubReturn(emptyNodeList);
-            replay(parentNode);
-
-            return new NodeListIterator(parentNode);
         }
+        final Node parentNode = createMock(Node.class);
+        expect(parentNode.getChildNodes()).andStubReturn(emptyNodeList);
+        replay(parentNode);
+
+        return new NodeListIterator(parentNode);
     }
 
     @Override
     public Iterator<Node> makeObject() {
         final NodeList nodeList = new NodeList() {
+            @Override
             public Node item(final int index) {
                 return nodes[index];
             }
+            @Override
             public int getLength() {
                 return nodes.length;
             }
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayIteratorTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayIteratorTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayIteratorTest.java	2013-11-20 21:53:39.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayIteratorTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -22,7 +22,6 @@
 /**
  * Tests the ObjectArrayIterator.
  *
- * @version $Id: ObjectArrayIteratorTest.java 1543964 2013-11-20 21:53:39Z tn $
  */
 public class ObjectArrayIteratorTest<E> extends AbstractIteratorTest<E> {
 
@@ -35,30 +34,30 @@
     @Override
     @SuppressWarnings("unchecked")
     public ObjectArrayIterator<E> makeEmptyIterator() {
-        return new ObjectArrayIterator<E>((E[]) new Object[0]);
+        return new ObjectArrayIterator<>((E[]) new Object[0]);
     }
 
     @Override
     @SuppressWarnings("unchecked")
     public ObjectArrayIterator<E> makeObject() {
-        return new ObjectArrayIterator<E>((E[]) testArray);
+        return new ObjectArrayIterator<>((E[]) testArray);
     }
 
     @SuppressWarnings("unchecked")
     public ObjectArrayIterator<E> makeArrayIterator() {
-        return new ObjectArrayIterator<E>();
+        return new ObjectArrayIterator<>();
     }
 
     public ObjectArrayIterator<E> makeArrayIterator(final E[] array) {
-        return new ObjectArrayIterator<E>(array);
+        return new ObjectArrayIterator<>(array);
     }
 
     public ObjectArrayIterator<E> makeArrayIterator(final E[] array, final int index) {
-        return new ObjectArrayIterator<E>(array, index);
+        return new ObjectArrayIterator<>(array, index);
     }
 
     public ObjectArrayIterator<E> makeArrayIterator(final E[] array, final int start, final int end) {
-        return new ObjectArrayIterator<E>(array, start, end);
+        return new ObjectArrayIterator<>(array, start, end);
     }
 
     @Override
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator2Test.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator2Test.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator2Test.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIterator2Test.java	2018-07-08 00:18:18.000000000 +0000
@@ -19,7 +19,6 @@
 /**
  * Tests the ObjectArrayListIterator class.
  *
- * @version $Id: ObjectArrayListIterator2Test.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 public class ObjectArrayListIterator2Test<E> extends AbstractListIteratorTest<E> {
 
@@ -32,17 +31,17 @@
     @Override
     @SuppressWarnings("unchecked")
     public ObjectArrayListIterator<E> makeEmptyIterator() {
-        return new ObjectArrayListIterator<E>((E[]) new Object[0]);
+        return new ObjectArrayListIterator<>((E[]) new Object[0]);
     }
 
     @Override
     @SuppressWarnings("unchecked")
     public ObjectArrayListIterator<E> makeObject() {
-        return new ObjectArrayListIterator<E>((E[]) testArray);
+        return new ObjectArrayListIterator<>((E[]) testArray);
     }
 
     public ObjectArrayListIterator<E> makeArrayListIterator(final E[] array) {
-        return new ObjectArrayListIterator<E>(array);
+        return new ObjectArrayListIterator<>(array);
     }
 
     @Override
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIteratorTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIteratorTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIteratorTest.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/ObjectArrayListIteratorTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -23,7 +23,6 @@
 /**
  * Tests the ObjectArrayListIterator class.
  *
- * @version $Id: ObjectArrayListIteratorTest.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 public class ObjectArrayListIteratorTest<E> extends ObjectArrayIteratorTest<E> {
 
@@ -34,17 +33,17 @@
     @Override
     @SuppressWarnings("unchecked")
     public ObjectArrayListIterator<E> makeEmptyIterator() {
-        return new ObjectArrayListIterator<E>((E[]) new Object[0]);
+        return new ObjectArrayListIterator<>((E[]) new Object[0]);
     }
 
     @Override
     @SuppressWarnings("unchecked")
     public ObjectArrayListIterator<E> makeObject() {
-        return new ObjectArrayListIterator<E>((E[]) testArray);
+        return new ObjectArrayListIterator<>((E[]) testArray);
     }
 
     public ObjectArrayListIterator<E> makeArrayListIterator(final E[] array) {
-        return new ObjectArrayListIterator<E>(array);
+        return new ObjectArrayListIterator<>(array);
     }
 
     /**
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/ObjectGraphIteratorTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/ObjectGraphIteratorTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/ObjectGraphIteratorTest.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/ObjectGraphIteratorTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -27,7 +27,6 @@
 /**
  * Testcase.
  *
- * @version $Id: ObjectGraphIteratorTest.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 public class ObjectGraphIteratorTest extends AbstractIteratorTest<Object> {
 
@@ -44,16 +43,16 @@
 
     @Override
     public void setUp() {
-        list1 = new ArrayList<String>();
+        list1 = new ArrayList<>();
         list1.add("One");
         list1.add("Two");
         list1.add("Three");
-        list2 = new ArrayList<String>();
+        list2 = new ArrayList<>();
         list2.add("Four");
-        list3 = new ArrayList<String>();
+        list3 = new ArrayList<>();
         list3.add("Five");
         list3.add("Six");
-        iteratorList = new ArrayList<Iterator<String>>();
+        iteratorList = new ArrayList<>();
         iteratorList.add(list1.iterator());
         iteratorList.add(list2.iterator());
         iteratorList.add(list3.iterator());
@@ -62,8 +61,8 @@
     //-----------------------------------------------------------------------
     @Override
     public ObjectGraphIterator<Object> makeEmptyIterator() {
-        final ArrayList<Object> list = new ArrayList<Object>();
-        return new ObjectGraphIterator<Object>(list.iterator());
+        final ArrayList<Object> list = new ArrayList<>();
+        return new ObjectGraphIterator<>(list.iterator());
     }
 
     @Override
@@ -73,7 +72,7 @@
 
     //-----------------------------------------------------------------------
     public void testIteratorConstructor_null1() {
-        final Iterator<Object> it = new ObjectGraphIterator<Object>(null);
+        final Iterator<Object> it = new ObjectGraphIterator<>(null);
 
         assertEquals(false, it.hasNext());
         try {
@@ -89,7 +88,7 @@
     }
 
     public void testIteratorConstructor_null_next() {
-        final Iterator<Object> it = new ObjectGraphIterator<Object>(null);
+        final Iterator<Object> it = new ObjectGraphIterator<>(null);
         try {
             it.next();
             fail();
@@ -98,7 +97,7 @@
     }
 
     public void testIteratorConstructor_null_remove() {
-        final Iterator<Object> it = new ObjectGraphIterator<Object>(null);
+        final Iterator<Object> it = new ObjectGraphIterator<>(null);
         try {
             it.remove();
             fail();
@@ -108,7 +107,7 @@
 
     //-----------------------------------------------------------------------
     public void testIteratorConstructorIteration_Empty() {
-        final List<Iterator<Object>> iteratorList = new ArrayList<Iterator<Object>>();
+        final List<Iterator<Object>> iteratorList = new ArrayList<>();
         final Iterator<Object> it = new ObjectGraphIterator<Object>(iteratorList.iterator());
 
         assertEquals(false, it.hasNext());
@@ -125,7 +124,7 @@
     }
 
     public void testIteratorConstructorIteration_Simple() {
-        final List<Iterator<String>> iteratorList = new ArrayList<Iterator<String>>();
+        final List<Iterator<String>> iteratorList = new ArrayList<>();
         iteratorList.add(list1.iterator());
         iteratorList.add(list2.iterator());
         iteratorList.add(list3.iterator());
@@ -144,7 +143,7 @@
     }
 
     public void testIteratorConstructorIteration_SimpleNoHasNext() {
-        final List<Iterator<String>> iteratorList = new ArrayList<Iterator<String>>();
+        final List<Iterator<String>> iteratorList = new ArrayList<>();
         iteratorList.add(list1.iterator());
         iteratorList.add(list2.iterator());
         iteratorList.add(list3.iterator());
@@ -161,7 +160,7 @@
     }
 
     public void testIteratorConstructorIteration_WithEmptyIterators() {
-        final List<Iterator<String>> iteratorList = new ArrayList<Iterator<String>>();
+        final List<Iterator<String>> iteratorList = new ArrayList<>();
         iteratorList.add(IteratorUtils.<String>emptyIterator());
         iteratorList.add(list1.iterator());
         iteratorList.add(IteratorUtils.<String>emptyIterator());
@@ -184,7 +183,7 @@
     }
 
     public void testIteratorConstructorRemove() {
-        final List<Iterator<String>> iteratorList = new ArrayList<Iterator<String>>();
+        final List<Iterator<String>> iteratorList = new ArrayList<>();
         iteratorList.add(list1.iterator());
         iteratorList.add(list2.iterator());
         iteratorList.add(list3.iterator());
@@ -202,7 +201,7 @@
 
     //-----------------------------------------------------------------------
     public void testIteration_IteratorOfIterators() {
-        final List<Iterator<String>> iteratorList = new ArrayList<Iterator<String>>();
+        final List<Iterator<String>> iteratorList = new ArrayList<>();
         iteratorList.add(list1.iterator());
         iteratorList.add(list2.iterator());
         iteratorList.add(list3.iterator());
@@ -216,7 +215,7 @@
     }
 
     public void testIteration_IteratorOfIteratorsWithEmptyIterators() {
-        final List<Iterator<String>> iteratorList = new ArrayList<Iterator<String>>();
+        final List<Iterator<String>> iteratorList = new ArrayList<>();
         iteratorList.add(IteratorUtils.<String>emptyIterator());
         iteratorList.add(list1.iterator());
         iteratorList.add(IteratorUtils.<String>emptyIterator());
@@ -235,7 +234,7 @@
 
     //-----------------------------------------------------------------------
     public void testIteration_RootNull() {
-        final Iterator<Object> it = new ObjectGraphIterator<Object>(null, null);
+        final Iterator<Object> it = new ObjectGraphIterator<>(null, null);
 
         assertEquals(false, it.hasNext());
         try {
@@ -267,7 +266,7 @@
     public void testIteration_Transformed1() {
         final Forest forest = new Forest();
         final Leaf l1 = forest.addTree().addBranch().addLeaf();
-        final Iterator<Object> it = new ObjectGraphIterator<Object>(forest, new LeafFinder());
+        final Iterator<Object> it = new ObjectGraphIterator<>(forest, new LeafFinder());
 
         assertEquals(true, it.hasNext());
         assertSame(l1, it.next());
@@ -295,7 +294,7 @@
         final Leaf l4 = b3.addLeaf();
         final Leaf l5 = b5.addLeaf();
 
-        final Iterator<Object> it = new ObjectGraphIterator<Object>(forest, new LeafFinder());
+        final Iterator<Object> it = new ObjectGraphIterator<>(forest, new LeafFinder());
 
         assertEquals(true, it.hasNext());
         assertSame(l1, it.next());
@@ -331,7 +330,7 @@
         final Leaf l4 = b3.addLeaf();
         final Leaf l5 = b4.addLeaf();
 
-        final Iterator<Object> it = new ObjectGraphIterator<Object>(forest, new LeafFinder());
+        final Iterator<Object> it = new ObjectGraphIterator<>(forest, new LeafFinder());
 
         assertEquals(true, it.hasNext());
         assertSame(l1, it.next());
@@ -353,6 +352,7 @@
 
     //-----------------------------------------------------------------------
     static class LeafFinder implements Transformer<Object, Object> {
+        @Override
         public Object transform(final Object input) {
             if (input instanceof Forest) {
                 return ((Forest) input).treeIterator();
@@ -372,7 +372,7 @@
 
     //-----------------------------------------------------------------------
     static class Forest {
-        List<Tree> trees = new ArrayList<Tree>();
+        List<Tree> trees = new ArrayList<>();
 
         Tree addTree() {
             trees.add(new Tree());
@@ -389,7 +389,7 @@
     }
 
     static class Tree {
-        List<Branch> branches = new ArrayList<Branch>();
+        List<Branch> branches = new ArrayList<>();
 
         Branch addBranch() {
             branches.add(new Branch());
@@ -406,7 +406,7 @@
     }
 
     static class Branch {
-        List<Leaf> leaves = new ArrayList<Leaf>();
+        List<Leaf> leaves = new ArrayList<>();
 
         Leaf addLeaf() {
             leaves.add(new Leaf());
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/PeekingIteratorTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/PeekingIteratorTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/PeekingIteratorTest.java	2013-05-07 05:12:06.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/PeekingIteratorTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -29,15 +29,13 @@
 
 /**
  * Tests the PeekingIterator.
- *
- * @version $Id: PeekingIteratorTest.java 1479760 2013-05-07 05:12:06Z tn $
  */
 public class PeekingIteratorTest<E> extends AbstractIteratorTest<E> {
 
-    private String[] testArray = { "a", "b", "c" };
+    private final String[] testArray = { "a", "b", "c" };
 
     private List<E> testList;
-    
+
     public PeekingIteratorTest(final String testName) {
         super(testName);
     }
@@ -49,7 +47,7 @@
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        testList = new ArrayList<E>(Arrays.asList((E[]) testArray));
+        testList = new ArrayList<>(Arrays.asList((E[]) testArray));
     }
 
     @Override
@@ -68,17 +66,17 @@
     }
 
     //-----------------------------------------------------------------------
-    
+
     @Test
     public void testEmpty() {
-        Iterator<E> it = makeEmptyIterator();
+        final Iterator<E> it = makeEmptyIterator();
         assertFalse(it.hasNext());
     }
 
     @Test
     @SuppressWarnings("unchecked")
     public void testSinglePeek() {
-        PeekingIterator<E> it = makeObject();
+        final PeekingIterator<E> it = makeObject();
         assertEquals("a", it.peek());
         assertEquals("a", it.element());
         validate(it, (E[]) testArray);
@@ -86,7 +84,7 @@
 
     @Test
     public void testMultiplePeek() {
-        PeekingIterator<E> it = makeObject();
+        final PeekingIterator<E> it = makeObject();
         assertEquals("a", it.peek());
         assertEquals("a", it.peek());
         assertEquals("a", it.next());
@@ -100,43 +98,43 @@
         assertEquals("c", it.next());
         assertFalse(it.hasNext());
     }
-    
+
     @Test
     public void testIteratorExhausted() {
-        PeekingIterator<E> it = makeObject();
+        final PeekingIterator<E> it = makeObject();
         it.next();
         it.next();
         it.next();
         assertFalse(it.hasNext());
         assertNull(it.peek());
-        
+
         try {
             it.element();
             fail();
-        } catch (NoSuchElementException e) {
+        } catch (final NoSuchElementException e) {
             // expected
         }
     }
 
     @Test
     public void testIllegalRemove() {
-        PeekingIterator<E> it = makeObject();
+        final PeekingIterator<E> it = makeObject();
         it.next();
         it.remove(); // supported
-        
+
         assertTrue(it.hasNext());
         assertEquals("b", it.peek());
-        
+
         try {
             it.remove();
             fail();
-        } catch (IllegalStateException e) {
+        } catch (final IllegalStateException e) {
             // expected
         }
     }
 
-    private void validate(Iterator<E> iter, E... items) {
-        for (E x : items) {
+    private void validate(final Iterator<E> iter, final E... items) {
+        for (final E x : items) {
             assertTrue(iter.hasNext());
             assertEquals(x, iter.next());
         }
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/PermutationIteratorTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/PermutationIteratorTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/PermutationIteratorTest.java	2013-04-30 19:28:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/PermutationIteratorTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -27,7 +27,6 @@
 /**
  * Test class for PermutationIterator.
  *
- * @version $Id: PermutationIteratorTest.java 1477789 2013-04-30 19:28:27Z sebb $
  * @since 4.0
  */
 public class PermutationIteratorTest extends AbstractIteratorTest<List<Character>> {
@@ -42,7 +41,7 @@
 
     @Override
     public void setUp() {
-        testList = new ArrayList<Character>();
+        testList = new ArrayList<>();
         testList.addAll(Arrays.asList(testArray));
     }
 
@@ -60,12 +59,12 @@
 
     @Override
     public PermutationIterator<Character> makeEmptyIterator() {
-        return new PermutationIterator<Character>(new ArrayList<Character>());
+        return new PermutationIterator<>(new ArrayList<Character>());
     }
 
     @Override
     public PermutationIterator<Character> makeObject() {
-        return new PermutationIterator<Character>(testList);
+        return new PermutationIterator<>(testList);
     }
 
     //-----------------------------------------------------------------------
@@ -74,11 +73,11 @@
     public void testPermutationResultSize() {
         int factorial = 1;
         for (int i = 0; i < 8; i++, factorial*=i) {
-            List<Integer> list = new ArrayList<Integer>();
+            final List<Integer> list = new ArrayList<>();
             for (int j = 0; j < i; j++) {
                 list.add(j);
             }
-            Iterator<List<Integer>> it = new PermutationIterator<Integer>(list);
+            final Iterator<List<Integer>> it = new PermutationIterator<>(list);
             int count = 0;
             while (it.hasNext()) {
                 it.next();
@@ -93,12 +92,12 @@
      */
     @SuppressWarnings("boxing") // OK in test code
     public void testPermutationExhaustivity() {
-        List<Character> perm1 = new ArrayList<Character>();
-        List<Character> perm2 = new ArrayList<Character>();
-        List<Character> perm3 = new ArrayList<Character>();
-        List<Character> perm4 = new ArrayList<Character>();
-        List<Character> perm5 = new ArrayList<Character>();
-        List<Character> perm6 = new ArrayList<Character>();
+        final List<Character> perm1 = new ArrayList<>();
+        final List<Character> perm2 = new ArrayList<>();
+        final List<Character> perm3 = new ArrayList<>();
+        final List<Character> perm4 = new ArrayList<>();
+        final List<Character> perm5 = new ArrayList<>();
+        final List<Character> perm6 = new ArrayList<>();
 
         perm1.add('A');
         perm2.add('A');
@@ -121,11 +120,11 @@
         perm5.add('B');
         perm6.add('A');
 
-        List<List<Character>> results = new ArrayList<List<Character>>();
+        final List<List<Character>> results = new ArrayList<>();
 
-        PermutationIterator<Character> it = makeObject();
+        final PermutationIterator<Character> it = makeObject();
         while (it.hasNext()) {
-            List<Character> next = it.next();
+            final List<Character> next = it.next();
             results.add(next);
         }
         //3! permutation for 3 elements
@@ -142,12 +141,12 @@
      * test checking that all the permutations are returned only once.
      */
     public void testPermutationUnicity() {
-        List<List<Character>> resultsList = new ArrayList<List<Character>>();
-        Set<List<Character>> resultsSet = new HashSet<List<Character>>();
+        final List<List<Character>> resultsList = new ArrayList<>();
+        final Set<List<Character>> resultsSet = new HashSet<>();
 
-        PermutationIterator<Character> it = makeObject();
+        final PermutationIterator<Character> it = makeObject();
         while (it.hasNext()) {
-            List<Character> permutation = it.next();
+            final List<Character> permutation = it.next();
             resultsList.add(permutation);
             resultsSet.add(permutation);
         }
@@ -157,24 +156,24 @@
     }
 
     public void testPermutationException() {
-        List<List<Character>> resultsList = new ArrayList<List<Character>>();
+        final List<List<Character>> resultsList = new ArrayList<>();
 
-        PermutationIterator<Character> it = makeObject();
+        final PermutationIterator<Character> it = makeObject();
         while (it.hasNext()) {
-            List<Character> permutation = it.next();
+            final List<Character> permutation = it.next();
             resultsList.add(permutation);
         }
         //asking for another permutation should throw an exception
         try {
             it.next();
             fail();
-        } catch (NoSuchElementException e) {
+        } catch (final NoSuchElementException e) {
             // expected
         }
     }
 
     public void testPermutatorHasMore() {
-        PermutationIterator<Character> it = makeObject();
+        final PermutationIterator<Character> it = makeObject();
         for (int i = 0; i < 6; i++) {
             assertTrue(it.hasNext());
             it.next();
@@ -183,11 +182,11 @@
     }
 
     public void testEmptyCollection() {
-        PermutationIterator<Character> it = makeEmptyIterator();
+        final PermutationIterator<Character> it = makeEmptyIterator();
         // there is one permutation for an empty set: 0! = 1
         assertTrue(it.hasNext());
 
-        List<Character> nextPermutation = it.next();
+        final List<Character> nextPermutation = it.next();
         assertEquals(0, nextPermutation.size());
 
         assertFalse(it.hasNext());
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/PushbackIteratorTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/PushbackIteratorTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/PushbackIteratorTest.java	2013-05-07 05:28:39.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/PushbackIteratorTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -27,12 +27,11 @@
 
 /**
  * Tests the PushbackIterator.
- * 
- * @version $Id: PushbackIteratorTest.java 1479763 2013-05-07 05:28:39Z tn $
+ *
  */
 public class PushbackIteratorTest<E> extends AbstractIteratorTest<E> {
 
-    private String[] testArray = { "a", "b", "c" };
+    private final String[] testArray = { "a", "b", "c" };
 
     private List<E> testList;
 
@@ -47,7 +46,7 @@
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        testList = new ArrayList<E>(Arrays.asList((E[]) testArray));
+        testList = new ArrayList<>(Arrays.asList((E[]) testArray));
     }
 
     @Override
@@ -69,7 +68,7 @@
 
     @Test
     public void testNormalIteration() {
-        PushbackIterator<E> iter = makeObject();
+        final PushbackIterator<E> iter = makeObject();
         assertEquals("a", iter.next());
         assertEquals("b", iter.next());
         assertEquals("c", iter.next());
@@ -79,7 +78,7 @@
     @Test
     @SuppressWarnings("unchecked")
     public void testImmediatePushback() {
-        PushbackIterator<E> iter = makeObject();
+        final PushbackIterator<E> iter = makeObject();
         iter.pushback((E) "x");
         assertEquals("x", iter.next());
         assertEquals("a", iter.next());
@@ -89,7 +88,7 @@
     @Test
     @SuppressWarnings("unchecked")
     public void testDelayedPushback() {
-        PushbackIterator<E> iter = makeObject();
+        final PushbackIterator<E> iter = makeObject();
         assertEquals("a", iter.next());
         iter.pushback((E) "x");
         assertEquals("x", iter.next());
@@ -100,7 +99,7 @@
     @Test
     @SuppressWarnings("unchecked")
     public void testMultiplePushback() {
-        PushbackIterator<E> iter = makeObject();
+        final PushbackIterator<E> iter = makeObject();
         assertEquals("a", iter.next());
         iter.pushback((E) "x");
         iter.pushback((E) "y");
@@ -110,7 +109,7 @@
         validate(iter, "c");
     }
 
-    private void validate(Iterator<E> iter, Object... items) {
+    private void validate(final Iterator<E> iter, final Object... items) {
         for (final Object x : items) {
             assertTrue(iter.hasNext());
             assertEquals(x, iter.next());
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/ReverseListIteratorTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/ReverseListIteratorTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/ReverseListIteratorTest.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/ReverseListIteratorTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -27,7 +27,6 @@
 /**
  * Tests the ReverseListIterator.
  *
- * @version $Id: ReverseListIteratorTest.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 public class ReverseListIteratorTest<E> extends AbstractListIteratorTest<E> {
 
@@ -39,14 +38,14 @@
 
     @Override
     public ListIterator<E> makeEmptyIterator() {
-        return new ReverseListIterator<E>(new ArrayList<E>());
+        return new ReverseListIterator<>(new ArrayList<E>());
     }
 
     @Override
     @SuppressWarnings("unchecked")
     public ReverseListIterator<E> makeObject() {
-        final List<E> list = new ArrayList<E>(Arrays.asList((E[]) testArray));
-        return new ReverseListIterator<E>(list);
+        final List<E> list = new ArrayList<>(Arrays.asList((E[]) testArray));
+        return new ReverseListIterator<>(list);
     }
 
     // overrides
@@ -77,7 +76,7 @@
 
     @Override
     public void testWalkForwardAndBack() {
-        final ArrayList<E> list = new ArrayList<E>();
+        final ArrayList<E> list = new ArrayList<>();
         final ListIterator<E> it = makeObject();
         while (it.hasNext()) {
             list.add(it.next());
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/SingletonIterator2Test.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/SingletonIterator2Test.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/SingletonIterator2Test.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/SingletonIterator2Test.java	2018-07-08 00:18:18.000000000 +0000
@@ -25,7 +25,6 @@
  * Tests the SingletonIterator to ensure that the next() method will actually
  * perform the iteration rather than the hasNext() method.
  *
- * @version $Id: SingletonIterator2Test.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 public class SingletonIterator2Test<E> extends AbstractIteratorTest<E> {
 
@@ -39,7 +38,7 @@
     @Override
     @SuppressWarnings("unchecked")
     public SingletonIterator<E> makeEmptyIterator() {
-        final SingletonIterator<E> iter = new SingletonIterator<E>((E) testValue);
+        final SingletonIterator<E> iter = new SingletonIterator<>((E) testValue);
         iter.next();
         iter.remove();
         iter.reset();
@@ -49,7 +48,7 @@
     @Override
     @SuppressWarnings("unchecked")
     public SingletonIterator<E> makeObject() {
-        return new SingletonIterator<E>((E) testValue, false);
+        return new SingletonIterator<>((E) testValue, false);
     }
 
     @Override
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/SingletonIteratorTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/SingletonIteratorTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/SingletonIteratorTest.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/SingletonIteratorTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -25,7 +25,6 @@
  * Tests the SingletonIterator to ensure that the next() method will actually
  * perform the iteration rather than the hasNext() method.
  *
- * @version $Id: SingletonIteratorTest.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 public class SingletonIteratorTest<E> extends AbstractIteratorTest<E> {
 
@@ -51,7 +50,7 @@
     @Override
     @SuppressWarnings("unchecked")
     public SingletonIterator<E> makeObject() {
-        return new SingletonIterator<E>((E) testValue);
+        return new SingletonIterator<>((E) testValue);
     }
 
     @Override
@@ -84,7 +83,7 @@
 
     @SuppressWarnings("unchecked")
     public void testSingletonIteratorRemove() {
-        final ResettableIterator<E> iter = new SingletonIterator<E>((E) "xyzzy");
+        final ResettableIterator<E> iter = new SingletonIterator<>((E) "xyzzy");
         assertTrue(iter.hasNext());
         assertEquals("xyzzy",iter.next());
         iter.remove();
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/SingletonListIteratorTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/SingletonListIteratorTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/SingletonListIteratorTest.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/SingletonListIteratorTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -24,7 +24,6 @@
 /**
  * Tests the SingletonListIterator.
  *
- * @version $Id: SingletonListIteratorTest.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 public class SingletonListIteratorTest<E> extends AbstractListIteratorTest<E> {
 
@@ -50,7 +49,7 @@
     @Override
     @SuppressWarnings("unchecked")
     public SingletonListIterator<E> makeObject() {
-        return new SingletonListIterator<E>((E) testValue);
+        return new SingletonListIterator<>((E) testValue);
     }
 
     @Override
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/SkippingIteratorTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/SkippingIteratorTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/SkippingIteratorTest.java	2015-05-28 09:42:01.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/SkippingIteratorTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -25,12 +25,11 @@
 /**
  * A unit test to test the basic functions of {@link SkippingIterator}.
  *
- * @version $Id: SkippingIteratorTest.java 1682188 2015-05-28 09:42:01Z tn $
  */
 public class SkippingIteratorTest<E> extends AbstractIteratorTest<E> {
 
     /** Test array of size 7 */
-    private String[] testArray = {
+    private final String[] testArray = {
         "a", "b", "c", "d", "e", "f", "g"
     };
 
@@ -50,12 +49,12 @@
 
     @Override
     public Iterator<E> makeEmptyIterator() {
-        return new SkippingIterator<E>(Collections.<E>emptyList().iterator(), 0);
+        return new SkippingIterator<>(Collections.<E>emptyList().iterator(), 0);
     }
 
     @Override
     public Iterator<E> makeObject() {
-        return new SkippingIterator<E>(new ArrayList<E>(testList).iterator(), 1);
+        return new SkippingIterator<>(new ArrayList<>(testList).iterator(), 1);
     }
 
     // ---------------- Tests ---------------------
@@ -67,7 +66,7 @@
      */
     @Test
     public void testSkipping() {
-        Iterator<E> iter = new SkippingIterator<E>(testList.iterator(), 2);
+        final Iterator<E> iter = new SkippingIterator<>(testList.iterator(), 2);
 
         assertTrue(iter.hasNext());
         assertEquals("c", iter.next());
@@ -84,7 +83,7 @@
         try {
             iter.next();
             fail("Expected NoSuchElementException.");
-        } catch (NoSuchElementException nsee) { /* Success case */
+        } catch (final NoSuchElementException nsee) { /* Success case */
         }
     }
 
@@ -95,7 +94,7 @@
      */
     @Test
     public void testSameAsDecorated() {
-        Iterator<E> iter = new SkippingIterator<E>(testList.iterator(), 0);
+        final Iterator<E> iter = new SkippingIterator<>(testList.iterator(), 0);
 
         assertTrue(iter.hasNext());
         assertEquals("a", iter.next());
@@ -116,7 +115,7 @@
         try {
             iter.next();
             fail("Expected NoSuchElementException.");
-        } catch (NoSuchElementException nsee) { /* Success case */
+        } catch (final NoSuchElementException nsee) { /* Success case */
         }
     }
 
@@ -127,12 +126,12 @@
      */
     @Test
     public void testOffsetGreaterThanSize() {
-        Iterator<E> iter = new SkippingIterator<E>(testList.iterator(), 10);
+        final Iterator<E> iter = new SkippingIterator<>(testList.iterator(), 10);
         assertFalse(iter.hasNext());
         try {
             iter.next();
             fail("Expected NoSuchElementException.");
-        } catch (NoSuchElementException nsee) { /* Success case */
+        } catch (final NoSuchElementException nsee) { /* Success case */
         }
     }
 
@@ -143,9 +142,9 @@
     @Test
     public void testNegativeOffset() {
         try {
-            new SkippingIterator<E>(testList.iterator(), -1);
+            new SkippingIterator<>(testList.iterator(), -1);
             fail("Expected IllegalArgumentException.");
-        } catch (IllegalArgumentException iae) { /* Success case */
+        } catch (final IllegalArgumentException iae) { /* Success case */
         }
     }
 
@@ -155,13 +154,13 @@
      */
     @Test
     public void testRemoveWithoutCallingNext() {
-        List<E> testListCopy = new ArrayList<E>(testList);
-        Iterator<E> iter = new SkippingIterator<E>(testListCopy.iterator(), 1);
+        final List<E> testListCopy = new ArrayList<>(testList);
+        final Iterator<E> iter = new SkippingIterator<>(testListCopy.iterator(), 1);
 
         try {
             iter.remove();
             fail("Expected IllegalStateException.");
-        } catch (IllegalStateException ise) { /* Success case */
+        } catch (final IllegalStateException ise) { /* Success case */
         }
     }
 
@@ -171,8 +170,8 @@
      */
     @Test
     public void testRemoveCalledTwice() {
-        List<E> testListCopy = new ArrayList<E>(testList);
-        Iterator<E> iter = new SkippingIterator<E>(testListCopy.iterator(), 1);
+        final List<E> testListCopy = new ArrayList<>(testList);
+        final Iterator<E> iter = new SkippingIterator<>(testListCopy.iterator(), 1);
 
         assertTrue(iter.hasNext());
         assertEquals("b", iter.next());
@@ -181,7 +180,7 @@
         try {
             iter.remove();
             fail("Expected IllegalStateException.");
-        } catch (IllegalStateException ise) { /* Success case */
+        } catch (final IllegalStateException ise) { /* Success case */
         }
     }
 
@@ -191,8 +190,8 @@
      */
     @Test
     public void testRemoveFirst() {
-        List<E> testListCopy = new ArrayList<E>(testList);
-        Iterator<E> iter = new SkippingIterator<E>(testListCopy.iterator(), 4);
+        final List<E> testListCopy = new ArrayList<>(testList);
+        final Iterator<E> iter = new SkippingIterator<>(testListCopy.iterator(), 4);
 
         assertTrue(iter.hasNext());
         assertEquals("e", iter.next());
@@ -209,7 +208,7 @@
         try {
             iter.next();
             fail("Expected NoSuchElementException.");
-        } catch (NoSuchElementException nsee) { /* Success case */
+        } catch (final NoSuchElementException nsee) { /* Success case */
         }
     }
 
@@ -219,8 +218,8 @@
      */
     @Test
     public void testRemoveMiddle() {
-        List<E> testListCopy = new ArrayList<E>(testList);
-        Iterator<E> iter = new SkippingIterator<E>(testListCopy.iterator(), 3);
+        final List<E> testListCopy = new ArrayList<>(testList);
+        final Iterator<E> iter = new SkippingIterator<>(testListCopy.iterator(), 3);
 
         assertTrue(iter.hasNext());
         assertEquals("d", iter.next());
@@ -239,7 +238,7 @@
         try {
             iter.next();
             fail("Expected NoSuchElementException.");
-        } catch (NoSuchElementException nsee) { /* Success case */
+        } catch (final NoSuchElementException nsee) { /* Success case */
         }
     }
 
@@ -249,8 +248,8 @@
      */
     @Test
     public void testRemoveLast() {
-        List<E> testListCopy = new ArrayList<E>(testList);
-        Iterator<E> iter = new SkippingIterator<E>(testListCopy.iterator(), 5);
+        final List<E> testListCopy = new ArrayList<>(testList);
+        final Iterator<E> iter = new SkippingIterator<>(testListCopy.iterator(), 5);
 
         assertTrue(iter.hasNext());
         assertEquals("f", iter.next());
@@ -261,7 +260,7 @@
         try {
             iter.next();
             fail("Expected NoSuchElementException.");
-        } catch (NoSuchElementException nsee) { /* Success case */
+        } catch (final NoSuchElementException nsee) { /* Success case */
         }
 
         iter.remove();
@@ -271,7 +270,7 @@
         try {
             iter.next();
             fail("Expected NoSuchElementException.");
-        } catch (NoSuchElementException nsee) { /* Success case */
+        } catch (final NoSuchElementException nsee) { /* Success case */
         }
     }
 
@@ -281,20 +280,20 @@
      */
     @Test
     public void testRemoveUnsupported() {
-        Iterator<E> mockIterator = new AbstractIteratorDecorator<E>(testList.iterator()) {
+        final Iterator<E> mockIterator = new AbstractIteratorDecorator<E>(testList.iterator()) {
             @Override
             public void remove() {
                 throw new UnsupportedOperationException();
             }
         };
 
-        Iterator<E> iter = new SkippingIterator<E>(mockIterator, 1);
+        final Iterator<E> iter = new SkippingIterator<>(mockIterator, 1);
         assertTrue(iter.hasNext());
         assertEquals("b", iter.next());
         try {
             iter.remove();
             fail("Expected UnsupportedOperationException.");
-        } catch (UnsupportedOperationException usoe) { /* Success case */
+        } catch (final UnsupportedOperationException usoe) { /* Success case */
         }
     }
 }
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/UniqueFilterIteratorTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/UniqueFilterIteratorTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/UniqueFilterIteratorTest.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/UniqueFilterIteratorTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -24,7 +24,6 @@
 /**
  * Tests the UniqueFilterIterator class.
  *
- * @version $Id: UniqueFilterIteratorTest.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 public class UniqueFilterIteratorTest<E> extends AbstractIteratorTest<E> {
 
@@ -41,7 +40,7 @@
     @Override
     @SuppressWarnings("unchecked")
     public void setUp() {
-        list1 = new ArrayList<E>();
+        list1 = new ArrayList<>();
         list1.add((E) "One");
         list1.add((E) "Two");
         list1.add((E) "Three");
@@ -56,14 +55,14 @@
 
     @Override
     public UniqueFilterIterator<E> makeEmptyIterator() {
-        final ArrayList<E> list = new ArrayList<E>();
-        return new UniqueFilterIterator<E>(list.iterator());
+        final ArrayList<E> list = new ArrayList<>();
+        return new UniqueFilterIterator<>(list.iterator());
     }
 
     @Override
     public UniqueFilterIterator<E> makeObject() {
         final Iterator<E> i = list1.iterator();
-        return new UniqueFilterIterator<E>(i);
+        return new UniqueFilterIterator<>(i);
     }
 
     public void testIterator() {
@@ -79,7 +78,7 @@
         try {
             iter.next();
         } catch (final Exception e) {
-            assertTrue("NoSuchElementException must be thrown", 
+            assertTrue("NoSuchElementException must be thrown",
                        e.getClass().equals(new NoSuchElementException().getClass()));
         }
     }
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableIteratorTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableIteratorTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableIteratorTest.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableIteratorTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -27,7 +27,6 @@
 /**
  * Tests the UnmodifiableIterator.
  *
- * @version $Id: UnmodifiableIteratorTest.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class UnmodifiableIteratorTest<E> extends AbstractIteratorTest<E> {
 
@@ -45,7 +44,7 @@
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        testList = new ArrayList<E>(Arrays.asList((E[]) testArray));
+        testList = new ArrayList<>(Arrays.asList((E[]) testArray));
     }
 
     @Override
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableListIteratorTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableListIteratorTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableListIteratorTest.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableListIteratorTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -27,7 +27,6 @@
 /**
  * Tests the UnmodifiableListIterator.
  *
- * @version $Id: UnmodifiableListIteratorTest.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class UnmodifiableListIteratorTest<E> extends AbstractListIteratorTest<E> {
 
@@ -45,7 +44,7 @@
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        testList = new ArrayList<E>(Arrays.asList((E[]) testArray));
+        testList = new ArrayList<>(Arrays.asList((E[]) testArray));
     }
 
     @Override
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableMapIteratorTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableMapIteratorTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableMapIteratorTest.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableMapIteratorTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -27,7 +27,6 @@
 /**
  * Tests the UnmodifiableMapIterator.
  *
- * @version $Id: UnmodifiableMapIteratorTest.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class UnmodifiableMapIteratorTest<K, V> extends AbstractMapIteratorTest<K, V> {
 
@@ -48,7 +47,7 @@
     @Override
     @SuppressWarnings("unchecked")
     public IterableMap<K, V> getMap() {
-        final IterableMap<K, V> testMap = new DualHashBidiMap<K, V>();
+        final IterableMap<K, V> testMap = new DualHashBidiMap<>();
         testMap.put((K) "A", (V) "a");
         testMap.put((K) "B", (V)"b");
         testMap.put((K) "C", (V) "c");
@@ -58,7 +57,7 @@
     @Override
     @SuppressWarnings("unchecked")
     public Map<K, V> getConfirmedMap() {
-        final Map<K, V> testMap = new HashMap<K, V>();
+        final Map<K, V> testMap = new HashMap<>();
         testMap.put((K) "A", (V) "a");
         testMap.put((K) "B", (V)"b");
         testMap.put((K) "C", (V) "c");
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIteratorTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIteratorTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIteratorTest.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/UnmodifiableOrderedMapIteratorTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -28,7 +28,6 @@
 /**
  * Tests the UnmodifiableOrderedMapIterator.
  *
- * @version $Id: UnmodifiableOrderedMapIteratorTest.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class UnmodifiableOrderedMapIteratorTest<K, V> extends AbstractOrderedMapIteratorTest<K, V> {
 
@@ -60,7 +59,7 @@
     @Override
     @SuppressWarnings("unchecked")
     public Map<K, V> getConfirmedMap() {
-        final Map<K, V> testMap = new TreeMap<K, V>();
+        final Map<K, V> testMap = new TreeMap<>();
         testMap.put((K) "A", (V) "a");
         testMap.put((K) "B", (V) "b");
         testMap.put((K) "C", (V) "c");
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/ZippingIteratorTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/ZippingIteratorTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/iterators/ZippingIteratorTest.java	2015-05-28 09:58:09.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/iterators/ZippingIteratorTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -23,7 +23,6 @@
 /**
  * Unit test suite for {@link ZippingIterator}.
  *
- * @version $Id: ZippingIteratorTest.java 1682196 2015-05-28 09:58:09Z tn $
  */
 @SuppressWarnings("boxing")
 public class ZippingIteratorTest extends AbstractIteratorTest<Integer> {
@@ -43,8 +42,8 @@
     @Override
     public void setUp() throws Exception {
         super.setUp();
-        evens = new ArrayList<Integer>();
-        odds = new ArrayList<Integer>();
+        evens = new ArrayList<>();
+        odds = new ArrayList<>();
         for (int i = 0; i < 20; i++) {
             if (0 == i % 2) {
                 evens.add(i);
@@ -52,7 +51,7 @@
                 odds.add(i);
             }
         }
-        fib = new ArrayList<Integer>();
+        fib = new ArrayList<>();
         fib.add(1);
         fib.add(1);
         fib.add(2);
@@ -68,19 +67,19 @@
     @Override
     @SuppressWarnings("unchecked")
     public ZippingIterator<Integer> makeEmptyIterator() {
-        return new ZippingIterator<Integer>(IteratorUtils.<Integer>emptyIterator());
+        return new ZippingIterator<>(IteratorUtils.<Integer>emptyIterator());
     }
 
     @Override
     public ZippingIterator<Integer> makeObject() {
-        return new ZippingIterator<Integer>(evens.iterator(), odds.iterator(), fib.iterator());
+        return new ZippingIterator<>(evens.iterator(), odds.iterator(), fib.iterator());
     }
 
     //------------------------------------------------------------------- Tests
 
     public void testIterateEven() {
         @SuppressWarnings("unchecked")
-        final ZippingIterator<Integer> iter = new ZippingIterator<Integer>(evens.iterator());
+        final ZippingIterator<Integer> iter = new ZippingIterator<>(evens.iterator());
         for (int i = 0; i < evens.size(); i++) {
             assertTrue(iter.hasNext());
             assertEquals(evens.get(i), iter.next());
@@ -89,7 +88,7 @@
     }
 
     public void testIterateEvenOdd() {
-        final ZippingIterator<Integer> iter = new ZippingIterator<Integer>(evens.iterator(), odds.iterator());
+        final ZippingIterator<Integer> iter = new ZippingIterator<>(evens.iterator(), odds.iterator());
         for (int i = 0; i < 20; i++) {
             assertTrue(iter.hasNext());
             assertEquals(Integer.valueOf(i), iter.next());
@@ -98,10 +97,10 @@
     }
 
     public void testIterateOddEven() {
-        final ZippingIterator<Integer> iter = new ZippingIterator<Integer>(odds.iterator(), evens.iterator());
+        final ZippingIterator<Integer> iter = new ZippingIterator<>(odds.iterator(), evens.iterator());
         for (int i = 0, j = 0; i < 20; i++) {
             assertTrue(iter.hasNext());
-            int val = iter.next();
+            final int val = iter.next();
             if (i % 2 == 0) {
                 assertEquals(odds.get(j).intValue(), val);
             } else {
@@ -113,7 +112,7 @@
     }
 
     public void testIterateEvenEven() {
-        final ZippingIterator<Integer> iter = new ZippingIterator<Integer>(evens.iterator(), evens.iterator());
+        final ZippingIterator<Integer> iter = new ZippingIterator<>(evens.iterator(), evens.iterator());
         for (int i = 0; i < evens.size(); i++) {
             assertTrue(iter.hasNext());
             assertEquals(evens.get(i), iter.next());
@@ -124,7 +123,7 @@
     }
 
     public void testIterateFibEvenOdd() {
-        final ZippingIterator<Integer> iter = new ZippingIterator<Integer>(fib.iterator(), evens.iterator(), odds.iterator());
+        final ZippingIterator<Integer> iter = new ZippingIterator<>(fib.iterator(), evens.iterator(), odds.iterator());
 
         assertEquals(Integer.valueOf(1),iter.next());  // fib    1
         assertEquals(Integer.valueOf(0),iter.next());  // even   0
@@ -160,7 +159,7 @@
 
     public void testRemoveFromSingle() {
         @SuppressWarnings("unchecked")
-        final ZippingIterator<Integer> iter = new ZippingIterator<Integer>(evens.iterator());
+        final ZippingIterator<Integer> iter = new ZippingIterator<>(evens.iterator());
         int expectedSize = evens.size();
         while (iter.hasNext()) {
             final Object o = iter.next();
@@ -174,7 +173,7 @@
     }
 
     public void testRemoveFromDouble() {
-        final ZippingIterator<Integer> iter = new ZippingIterator<Integer>(evens.iterator(), odds.iterator());
+        final ZippingIterator<Integer> iter = new ZippingIterator<>(evens.iterator(), odds.iterator());
         int expectedSize = evens.size() + odds.size();
         while (iter.hasNext()) {
             final Object o = iter.next();
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/IteratorUtilsTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/IteratorUtilsTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/IteratorUtilsTest.java	2015-06-22 19:48:47.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/IteratorUtilsTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -32,16 +32,22 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.ListIterator;
+import java.util.Map;
 import java.util.NoSuchElementException;
+import java.util.Vector;
 
 import org.apache.commons.collections4.iterators.EmptyIterator;
 import org.apache.commons.collections4.iterators.EmptyListIterator;
 import org.apache.commons.collections4.iterators.EmptyMapIterator;
 import org.apache.commons.collections4.iterators.EmptyOrderedIterator;
 import org.apache.commons.collections4.iterators.EmptyOrderedMapIterator;
+import org.apache.commons.collections4.iterators.EnumerationIterator;
+import org.apache.commons.collections4.iterators.NodeListIterator;
+import org.apache.commons.collections4.iterators.ObjectArrayIterator;
 import org.junit.Before;
 import org.junit.Test;
 import org.w3c.dom.Node;
@@ -49,8 +55,6 @@
 
 /**
  * Tests for IteratorUtils.
- *
- * @version $Id: IteratorUtilsTest.java 1686921 2015-06-22 19:48:47Z tn $
  */
 public class IteratorUtilsTest {
 
@@ -69,13 +73,69 @@
      */
     private List<Integer> collectionOdd = null;
 
+    private final Collection<Integer> emptyCollection = new ArrayList<>(1);
+
     private Iterable<Integer> iterableA = null;
 
-    private final Collection<Integer> emptyCollection = new ArrayList<Integer>(1);
+    /**
+     * Creates a NodeList containing the specified nodes.
+     */
+    private NodeList createNodeList(final Node[] nodes) {
+        return new NodeList() {
+            @Override
+            public int getLength() {
+                return nodes.length;
+            }
+            @Override
+            public Node item(final int index) {
+                return nodes[index];
+            }
+        };
+    }
+
+    /**
+     * creates an array of four Node instances, mocked by EasyMock.
+     */
+    private Node[] createNodes() {
+        final Node node1 = createMock(Node.class);
+        final Node node2 = createMock(Node.class);
+        final Node node3 = createMock(Node.class);
+        final Node node4 = createMock(Node.class);
+        replay(node1);
+        replay(node2);
+        replay(node3);
+        replay(node4);
+
+        return new Node[]{node1, node2, node3, node4};
+}
+
+    /**
+     * Gets an immutable Iterator operating on the elements ["a", "b", "c", "d"].
+     */
+    private Iterator<String> getImmutableIterator() {
+        final List<String> list = new ArrayList<>();
+        list.add("a");
+        list.add("b");
+        list.add("c");
+        list.add("d");
+        return IteratorUtils.unmodifiableIterator(list.iterator());
+    }
+
+    /**
+     * Gets an immutable ListIterator operating on the elements ["a", "b", "c", "d"].
+     */
+    private ListIterator<String> getImmutableListIterator() {
+        final List<String> list = new ArrayList<>();
+        list.add("a");
+        list.add("b");
+        list.add("c");
+        list.add("d");
+        return IteratorUtils.unmodifiableListIterator(list.listIterator());
+    }
 
     @Before
     public void setUp() {
-        collectionA = new ArrayList<Integer>();
+        collectionA = new ArrayList<>();
         collectionA.add(1);
         collectionA.add(2);
         collectionA.add(2);
@@ -94,104 +154,6 @@
     }
 
     @Test
-    public void testAsIterable() {
-        final List<Integer> list = new ArrayList<Integer>();
-        list.add(Integer.valueOf(0));
-        list.add(Integer.valueOf(1));
-        list.add(Integer.valueOf(2));
-        final Iterator<Integer> iterator = list.iterator();
-
-        final Iterable<Integer> iterable = IteratorUtils.asIterable(iterator);
-        int expected = 0;
-        for(final Integer actual : iterable) {
-            assertEquals(expected, actual.intValue());
-            ++expected;
-        }
-        // insure iteration occurred
-        assertTrue(expected > 0);
-
-        // single use iterator
-        assertFalse("should not be able to iterate twice", IteratorUtils.asIterable(iterator).iterator().hasNext());
-    }
-
-    @Test
-    public void testAsIterableNull() {
-        try {
-            IteratorUtils.asIterable(null);
-            fail("Expecting NullPointerException");
-        } catch (final NullPointerException ex) {
-            // success
-        }
-    }
-
-    @Test
-    public void testAsMultipleIterable() {
-        final List<Integer> list = new ArrayList<Integer>();
-        list.add(Integer.valueOf(0));
-        list.add(Integer.valueOf(1));
-        list.add(Integer.valueOf(2));
-        final Iterator<Integer> iterator = list.iterator();
-
-        final Iterable<Integer> iterable = IteratorUtils.asMultipleUseIterable(iterator);
-        int expected = 0;
-        for(final Integer actual : iterable) {
-            assertEquals(expected, actual.intValue());
-            ++expected;
-        }
-        // insure iteration occurred
-        assertTrue(expected > 0);
-
-        // multiple use iterator
-        expected = 0;
-        for(final Integer actual : iterable) {
-            assertEquals(expected, actual.intValue());
-            ++expected;
-        }
-        // insure iteration occurred
-        assertTrue(expected > 0);
-    }
-
-    @Test
-    public void testAsMultipleIterableNull() {
-        try {
-            IteratorUtils.asMultipleUseIterable(null);
-            fail("Expecting NullPointerException");
-        } catch (final NullPointerException ex) {
-            // success
-        }
-    }
-
-    @Test
-    public void testToList() {
-        final List<Object> list = new ArrayList<Object>();
-        list.add(Integer.valueOf(1));
-        list.add("Two");
-        list.add(null);
-        final List<Object> result = IteratorUtils.toList(list.iterator());
-        assertEquals(list, result);
-    }
-
-    @Test
-    public void testToArray() {
-        final List<Object> list = new ArrayList<Object>();
-        list.add(Integer.valueOf(1));
-        list.add("Two");
-        list.add(null);
-        final Object[] result = IteratorUtils.toArray(list.iterator());
-        assertEquals(list, Arrays.asList(result));
-    }
-
-    @Test
-    public void testToArray2() {
-        final List<String> list = new ArrayList<String>();
-        list.add("One");
-        list.add("Two");
-        list.add(null);
-        final String[] result = IteratorUtils.toArray(list.iterator(), String.class);
-        assertEquals(list, Arrays.asList(result));
-    }
-
-    @Test
     public void testArrayIterator() {
         final Object[] objArray = {"a", "b", "c"};
         ResettableIterator<Object> iterator = IteratorUtils.arrayIterator(objArray);
@@ -475,70 +437,165 @@
         }
     }
 
+    @Test
+    public void testAsIterable() {
+        final List<Integer> list = new ArrayList<>();
+        list.add(Integer.valueOf(0));
+        list.add(Integer.valueOf(1));
+        list.add(Integer.valueOf(2));
+        final Iterator<Integer> iterator = list.iterator();
 
-    /**
-     * Gets an immutable Iterator operating on the elements ["a", "b", "c", "d"].
-     */
-    private Iterator<String> getImmutableIterator() {
-        final List<String> list = new ArrayList<String>();
-        list.add("a");
-        list.add("b");
-        list.add("c");
-        list.add("d");
-        return IteratorUtils.unmodifiableIterator(list.iterator());
-    }
+        final Iterable<Integer> iterable = IteratorUtils.asIterable(iterator);
+        int expected = 0;
+        for(final Integer actual : iterable) {
+            assertEquals(expected, actual.intValue());
+            ++expected;
+        }
+        // insure iteration occurred
+        assertTrue(expected > 0);
 
-    /**
-     * Gets an immutable ListIterator operating on the elements ["a", "b", "c", "d"].
-     */
-    private ListIterator<String> getImmutableListIterator() {
-        final List<String> list = new ArrayList<String>();
-        list.add("a");
-        list.add("b");
-        list.add("c");
-        list.add("d");
-        return IteratorUtils.unmodifiableListIterator(list.listIterator());
+        // single use iterator
+        assertFalse("should not be able to iterate twice", IteratorUtils.asIterable(iterator).iterator().hasNext());
     }
 
-    //-----------------------------------------------------------------------
-    /**
-     * Test empty iterator
-     */
     @Test
-    public void testEmptyIterator() {
-        assertSame(EmptyIterator.INSTANCE, IteratorUtils.EMPTY_ITERATOR);
-        assertSame(EmptyIterator.RESETTABLE_INSTANCE, IteratorUtils.EMPTY_ITERATOR);
-        assertEquals(true, IteratorUtils.EMPTY_ITERATOR instanceof Iterator);
-        assertEquals(true, IteratorUtils.EMPTY_ITERATOR instanceof ResettableIterator);
-        assertEquals(false, IteratorUtils.EMPTY_ITERATOR instanceof OrderedIterator);
-        assertEquals(false, IteratorUtils.EMPTY_ITERATOR instanceof ListIterator);
-        assertEquals(false, IteratorUtils.EMPTY_ITERATOR instanceof MapIterator);
-        assertEquals(false, IteratorUtils.EMPTY_ITERATOR.hasNext());
-        IteratorUtils.EMPTY_ITERATOR.reset();
-        assertSame(IteratorUtils.EMPTY_ITERATOR, IteratorUtils.EMPTY_ITERATOR);
-        assertSame(IteratorUtils.EMPTY_ITERATOR, IteratorUtils.emptyIterator());
+    public void testAsIterableNull() {
         try {
-            IteratorUtils.EMPTY_ITERATOR.next();
-            fail();
-        } catch (final NoSuchElementException ex) {}
+            IteratorUtils.asIterable(null);
+            fail("Expecting NullPointerException");
+        } catch (final NullPointerException ex) {
+            // success
+        }
+    }
+
+    @Test
+    public void testAsMultipleIterable() {
+        final List<Integer> list = new ArrayList<>();
+        list.add(Integer.valueOf(0));
+        list.add(Integer.valueOf(1));
+        list.add(Integer.valueOf(2));
+        final Iterator<Integer> iterator = list.iterator();
+
+        final Iterable<Integer> iterable = IteratorUtils.asMultipleUseIterable(iterator);
+        int expected = 0;
+        for(final Integer actual : iterable) {
+            assertEquals(expected, actual.intValue());
+            ++expected;
+        }
+        // insure iteration occurred
+        assertTrue(expected > 0);
+
+        // multiple use iterator
+        expected = 0;
+        for(final Integer actual : iterable) {
+            assertEquals(expected, actual.intValue());
+            ++expected;
+        }
+        // insure iteration occurred
+        assertTrue(expected > 0);
+    }
+
+
+    @Test
+    public void testAsMultipleIterableNull() {
         try {
-            IteratorUtils.EMPTY_ITERATOR.remove();
-            fail();
-        } catch (final IllegalStateException ex) {}
+            IteratorUtils.asMultipleUseIterable(null);
+            fail("Expecting NullPointerException");
+        } catch (final NullPointerException ex) {
+            // success
+        }
     }
 
-    //-----------------------------------------------------------------------
     /**
-     * Test empty list iterator
+     * Tests methods collatedIterator(...)
      */
     @Test
-    public void testEmptyListIterator() {
-        assertSame(EmptyListIterator.INSTANCE, IteratorUtils.EMPTY_LIST_ITERATOR);
-        assertSame(EmptyListIterator.RESETTABLE_INSTANCE, IteratorUtils.EMPTY_LIST_ITERATOR);
-        assertEquals(true, IteratorUtils.EMPTY_LIST_ITERATOR instanceof Iterator);
-        assertEquals(true, IteratorUtils.EMPTY_LIST_ITERATOR instanceof ListIterator);
-        assertEquals(true, IteratorUtils.EMPTY_LIST_ITERATOR instanceof ResettableIterator);
-        assertEquals(true, IteratorUtils.EMPTY_LIST_ITERATOR instanceof ResettableListIterator);
+    public void testCollatedIterator() {
+        try {
+            IteratorUtils.collatedIterator(null, collectionOdd.iterator(), null);
+            fail("expecting NullPointerException");
+        } catch (final NullPointerException npe) {
+            // expected
+        }
+
+        try {
+            IteratorUtils.collatedIterator(null, null, collectionEven.iterator());
+            fail("expecting NullPointerException");
+        } catch (final NullPointerException npe) {
+            // expected
+        }
+
+        // natural ordering
+        Iterator<Integer> it =
+                IteratorUtils.collatedIterator(null, collectionOdd.iterator(), collectionEven.iterator());
+
+        List<Integer> result = IteratorUtils.toList(it);
+        assertEquals(12, result.size());
+
+        final List<Integer> combinedList = new ArrayList<>();
+        combinedList.addAll(collectionOdd);
+        combinedList.addAll(collectionEven);
+        Collections.sort(combinedList);
+
+        assertEquals(combinedList, result);
+
+        it = IteratorUtils.collatedIterator(null, collectionOdd.iterator(), emptyCollection.iterator());
+        result = IteratorUtils.toList(it);
+        assertEquals(collectionOdd, result);
+
+        final Comparator<Integer> reverseComparator =
+                ComparatorUtils.reversedComparator(ComparatorUtils.<Integer>naturalComparator());
+
+        Collections.reverse(collectionOdd);
+        Collections.reverse(collectionEven);
+        Collections.reverse(combinedList);
+
+        it = IteratorUtils.collatedIterator(reverseComparator,
+                                            collectionOdd.iterator(),
+                                            collectionEven.iterator());
+        result = IteratorUtils.toList(it);
+        assertEquals(combinedList, result);
+    }
+
+    //-----------------------------------------------------------------------
+    /**
+     * Test empty iterator
+     */
+    @Test
+    public void testEmptyIterator() {
+        assertSame(EmptyIterator.INSTANCE, IteratorUtils.EMPTY_ITERATOR);
+        assertSame(EmptyIterator.RESETTABLE_INSTANCE, IteratorUtils.EMPTY_ITERATOR);
+        assertEquals(true, IteratorUtils.EMPTY_ITERATOR instanceof Iterator);
+        assertEquals(true, IteratorUtils.EMPTY_ITERATOR instanceof ResettableIterator);
+        assertEquals(false, IteratorUtils.EMPTY_ITERATOR instanceof OrderedIterator);
+        assertEquals(false, IteratorUtils.EMPTY_ITERATOR instanceof ListIterator);
+        assertEquals(false, IteratorUtils.EMPTY_ITERATOR instanceof MapIterator);
+        assertEquals(false, IteratorUtils.EMPTY_ITERATOR.hasNext());
+        IteratorUtils.EMPTY_ITERATOR.reset();
+        assertSame(IteratorUtils.EMPTY_ITERATOR, IteratorUtils.EMPTY_ITERATOR);
+        assertSame(IteratorUtils.EMPTY_ITERATOR, IteratorUtils.emptyIterator());
+        try {
+            IteratorUtils.EMPTY_ITERATOR.next();
+            fail();
+        } catch (final NoSuchElementException ex) {}
+        try {
+            IteratorUtils.EMPTY_ITERATOR.remove();
+            fail();
+        } catch (final IllegalStateException ex) {}
+    }
+
+    //-----------------------------------------------------------------------
+    /**
+     * Test empty list iterator
+     */
+    @Test
+    public void testEmptyListIterator() {
+        assertSame(EmptyListIterator.INSTANCE, IteratorUtils.EMPTY_LIST_ITERATOR);
+        assertSame(EmptyListIterator.RESETTABLE_INSTANCE, IteratorUtils.EMPTY_LIST_ITERATOR);
+        assertEquals(true, IteratorUtils.EMPTY_LIST_ITERATOR instanceof Iterator);
+        assertEquals(true, IteratorUtils.EMPTY_LIST_ITERATOR instanceof ListIterator);
+        assertEquals(true, IteratorUtils.EMPTY_LIST_ITERATOR instanceof ResettableIterator);
+        assertEquals(true, IteratorUtils.EMPTY_LIST_ITERATOR instanceof ResettableListIterator);
         assertEquals(false, IteratorUtils.EMPTY_LIST_ITERATOR instanceof MapIterator);
         assertEquals(false, IteratorUtils.EMPTY_LIST_ITERATOR.hasNext());
         assertEquals(0, IteratorUtils.EMPTY_LIST_ITERATOR.nextIndex());
@@ -684,179 +741,154 @@
         } catch (final IllegalStateException ex) {}
     }
 
-    //-----------------------------------------------------------------------
-    /**
-     * Test next() and hasNext() for an immutable Iterator.
-     */
     @Test
-    public void testUnmodifiableIteratorIteration() {
-        final Iterator<String> iterator = getImmutableIterator();
-
-        assertTrue(iterator.hasNext());
-
-        assertEquals("a", iterator.next());
-
-        assertTrue(iterator.hasNext());
-
-        assertEquals("b", iterator.next());
-
-        assertTrue(iterator.hasNext());
-
-        assertEquals("c", iterator.next());
-
-        assertTrue(iterator.hasNext());
-
-        assertEquals("d", iterator.next());
-
-        assertTrue(!iterator.hasNext());
+    public void testFind() {
+        Predicate<Number> testPredicate = equalPredicate((Number) 4);
+        Integer test = IteratorUtils.find(iterableA.iterator(), testPredicate);
+        assertTrue(test.equals(4));
+        testPredicate = equalPredicate((Number) 45);
+        test = IteratorUtils.find(iterableA.iterator(), testPredicate);
+        assertTrue(test == null);
+        assertNull(IteratorUtils.find(null,testPredicate));
+        try {
+            assertNull(IteratorUtils.find(iterableA.iterator(), null));
+            fail("expecting NullPointerException");
+        } catch (final NullPointerException npe) {
+            // expected
+        }
     }
 
-    /**
-     * Test next(), hasNext(), previous() and hasPrevious() for an immutable
-     * ListIterator.
-     */
     @Test
-    public void testUnmodifiableListIteratorIteration() {
-        final ListIterator<String> listIterator = getImmutableListIterator();
-
-        assertTrue(!listIterator.hasPrevious());
-        assertTrue(listIterator.hasNext());
-
-        assertEquals("a", listIterator.next());
-
-        assertTrue(listIterator.hasPrevious());
-        assertTrue(listIterator.hasNext());
-
-        assertEquals("b", listIterator.next());
-
-        assertTrue(listIterator.hasPrevious());
-        assertTrue(listIterator.hasNext());
-
-        assertEquals("c", listIterator.next());
+    public void testFirstFromIterator() throws Exception {
+        // Iterator, entry exists
+        final Iterator<Integer> iterator = iterableA.iterator();
+        assertEquals(1, (int) IteratorUtils.first(iterator));
+    }
 
-        assertTrue(listIterator.hasPrevious());
-        assertTrue(listIterator.hasNext());
+    // -----------------------------------------------------------------------
+    @Test
+    public void testForEach() {
+        final List<Integer> listA = new ArrayList<>();
+        listA.add(1);
 
-        assertEquals("d", listIterator.next());
+        final List<Integer> listB = new ArrayList<>();
+        listB.add(2);
 
-        assertTrue(listIterator.hasPrevious());
-        assertTrue(!listIterator.hasNext());
+        final Closure<List<Integer>> testClosure = ClosureUtils.invokerClosure("clear");
+        final Collection<List<Integer>> col = new ArrayList<>();
+        col.add(listA);
+        col.add(listB);
+        IteratorUtils.forEach(col.iterator(), testClosure);
+        assertTrue(listA.isEmpty() && listB.isEmpty());
+        try {
+            IteratorUtils.forEach(col.iterator(), null);
+            fail("expecting NullPointerException");
+        } catch (final NullPointerException npe) {
+            // expected
+        }
 
-        assertEquals("d", listIterator.previous());
+        IteratorUtils.forEach(null, testClosure);
 
-        assertTrue(listIterator.hasPrevious());
-        assertTrue(listIterator.hasNext());
+        // null should be OK
+        col.add(null);
+        IteratorUtils.forEach(col.iterator(), testClosure);
+    }
 
-        assertEquals("c", listIterator.previous());
+    @Test
+    public void testForEachButLast() {
+        final List<Integer> listA = new ArrayList<>();
+        listA.add(1);
 
-        assertTrue(listIterator.hasPrevious());
-        assertTrue(listIterator.hasNext());
+        final List<Integer> listB = new ArrayList<>();
+        listB.add(2);
 
-        assertEquals("b", listIterator.previous());
+        final Closure<List<Integer>> testClosure = ClosureUtils.invokerClosure("clear");
+        final Collection<List<Integer>> col = new ArrayList<>();
+        col.add(listA);
+        col.add(listB);
+        List<Integer> last = IteratorUtils.forEachButLast(col.iterator(), testClosure);
+        assertTrue(listA.isEmpty() && !listB.isEmpty());
+        assertSame(listB, last);
 
-        assertTrue(listIterator.hasPrevious());
-        assertTrue(listIterator.hasNext());
+        try {
+            IteratorUtils.forEachButLast(col.iterator(), null);
+            fail("expecting NullPointerException");
+        } catch (final NullPointerException npe) {
+            // expected
+        }
 
-        assertEquals("a", listIterator.previous());
+        IteratorUtils.forEachButLast(null, testClosure);
 
-        assertTrue(!listIterator.hasPrevious());
-        assertTrue(listIterator.hasNext());
+        // null should be OK
+        col.add(null);
+        col.add(null);
+        last = IteratorUtils.forEachButLast(col.iterator(), testClosure);
+        assertNull(last);
     }
 
-    /**
-     * Test remove() for an immutable Iterator.
-     */
     @Test
-    public void testUnmodifiableIteratorImmutability() {
-        final Iterator<String> iterator = getImmutableIterator();
+    public void testGetAtIndexFromIterator() throws Exception {
+        // Iterator, entry exists
+        Iterator<Integer> iterator = iterableA.iterator();
+        assertEquals(1, (int) IteratorUtils.get(iterator, 0));
+        iterator = iterableA.iterator();
+        assertEquals(2, (int) IteratorUtils.get(iterator, 1));
 
+        // Iterator, non-existent entry
         try {
-            iterator.remove();
-            // We shouldn't get to here.
-            fail("remove() should throw an UnsupportedOperationException");
-        } catch (final UnsupportedOperationException e) {
-            // This is correct; ignore the exception.
+            IteratorUtils.get(iterator, 10);
+            fail("Expecting IndexOutOfBoundsException.");
+        } catch (final IndexOutOfBoundsException e) {
+            // expected
         }
+        assertTrue(!iterator.hasNext());
+    }
+    @Test
+    public void testGetIterator() {
+    	final Object[] objArray = {"a", "b", "c"};
+        final Map<String, String> inMap = new HashMap<>();
+        final Node[] nodes = createNodes();
+        final NodeList nodeList = createNodeList(nodes);
 
-        iterator.next();
+        assertTrue("returns empty iterator when null passed", IteratorUtils.getIterator(null) instanceof EmptyIterator);
+        assertTrue("returns Iterator when Iterator directly ", IteratorUtils.getIterator(iterableA.iterator()) instanceof Iterator);
+        assertTrue("returns Iterator when iterable passed", IteratorUtils.getIterator(iterableA) instanceof Iterator);
+        assertTrue("returns ObjectArrayIterator when Object array passed", IteratorUtils.getIterator(objArray) instanceof ObjectArrayIterator);
+        assertTrue("returns Iterator when Map passed", IteratorUtils.getIterator(inMap) instanceof Iterator);
+        assertTrue("returns NodeListIterator when nodeList passed", IteratorUtils.getIterator(nodeList) instanceof NodeListIterator);
+        assertTrue("returns EnumerationIterator when Enumeration passed", IteratorUtils.getIterator(new Vector().elements()) instanceof EnumerationIterator);
 
+    }
+
+    @Test
+    public void testIndexOf() {
+        Predicate<Number> testPredicate = equalPredicate((Number) 4);
+        int index = IteratorUtils.indexOf(iterableA.iterator(), testPredicate);
+        assertEquals(6, index);
+        testPredicate = equalPredicate((Number) 45);
+        index = IteratorUtils.indexOf(iterableA.iterator(), testPredicate);
+        assertEquals(-1, index);
+        assertEquals(-1, IteratorUtils.indexOf(null, testPredicate));
         try {
-            iterator.remove();
-            // We shouldn't get to here.
-            fail("remove() should throw an UnsupportedOperationException");
-        } catch (final UnsupportedOperationException e) {
-            // This is correct; ignore the exception.
+            IteratorUtils.indexOf(iterableA.iterator(), null);
+            fail("expecting NullPointerException");
+        } catch (final NullPointerException npe) {
+            // expected
         }
-
     }
 
     /**
-     * Test remove() for an immutable ListIterator.
+     * Tests method nodeListIterator(Node)
      */
     @Test
-    public void testUnmodifiableListIteratorImmutability() {
-        final ListIterator<String> listIterator = getImmutableListIterator();
-
-        try {
-            listIterator.remove();
-            // We shouldn't get to here.
-            fail("remove() should throw an UnsupportedOperationException");
-        } catch (final UnsupportedOperationException e) {
-            // This is correct; ignore the exception.
-        }
-
-        try {
-            listIterator.set("a");
-            // We shouldn't get to here.
-            fail("set(Object) should throw an UnsupportedOperationException");
-        } catch (final UnsupportedOperationException e) {
-            // This is correct; ignore the exception.
-        }
-
-        try {
-            listIterator.add("a");
-            // We shouldn't get to here.
-            fail("add(Object) should throw an UnsupportedOperationException");
-        } catch (final UnsupportedOperationException e) {
-            // This is correct; ignore the exception.
-        }
-
-        listIterator.next();
-
-        try {
-            listIterator.remove();
-            // We shouldn't get to here.
-            fail("remove() should throw an UnsupportedOperationException");
-        } catch (final UnsupportedOperationException e) {
-            // This is correct; ignore the exception.
-        }
-
-        try {
-            listIterator.set("a");
-            // We shouldn't get to here.
-            fail("set(Object) should throw an UnsupportedOperationException");
-        } catch (final UnsupportedOperationException e) {
-            // This is correct; ignore the exception.
-        }
-
-        try {
-            listIterator.add("a");
-            // We shouldn't get to here.
-            fail("add(Object) should throw an UnsupportedOperationException");
-        } catch (final UnsupportedOperationException e) {
-            // This is correct; ignore the exception.
-        }
-    }
-
-    /**
-     * Tests method nodeListIterator(NodeList)
-     */
-    @Test
-    public void testNodeListIterator() {
+    public void testNodeIterator() {
         final Node[] nodes = createNodes();
         final NodeList nodeList = createNodeList(nodes);
+        final Node parentNode = createMock(Node.class);
+        expect(parentNode.getChildNodes()).andStubReturn(nodeList);
+        replay(parentNode);
 
-        final Iterator<Node> iterator = IteratorUtils.nodeListIterator(nodeList);
+        final Iterator<Node> iterator = IteratorUtils.nodeListIterator(parentNode);
         int expectedNodeIndex = 0;
         for (final Node actual : IteratorUtils.asIterable(iterator)) {
             assertEquals(nodes[expectedNodeIndex], actual);
@@ -869,18 +901,16 @@
         // single use iterator
         assertFalse("should not be able to iterate twice", IteratorUtils.asIterable(iterator).iterator().hasNext());
     }
+
     /**
-     * Tests method nodeListIterator(Node)
+     * Tests method nodeListIterator(NodeList)
      */
     @Test
-    public void testNodeIterator() {
+    public void testNodeListIterator() {
         final Node[] nodes = createNodes();
         final NodeList nodeList = createNodeList(nodes);
-        final Node parentNode = createMock(Node.class);
-        expect(parentNode.getChildNodes()).andStubReturn(nodeList);
-        replay(parentNode);
 
-        final Iterator<Node> iterator = IteratorUtils.nodeListIterator(parentNode);
+        final Iterator<Node> iterator = IteratorUtils.nodeListIterator(nodeList);
         int expectedNodeIndex = 0;
         for (final Node actual : IteratorUtils.asIterable(iterator)) {
             assertEquals(nodes[expectedNodeIndex], actual);
@@ -894,200 +924,245 @@
         assertFalse("should not be able to iterate twice", IteratorUtils.asIterable(iterator).iterator().hasNext());
     }
 
-    /**
-     * creates an array of four Node instances, mocked by EasyMock.
-     */
-    private Node[] createNodes() {
-        final Node node1 = createMock(Node.class);
-        final Node node2 = createMock(Node.class);
-        final Node node3 = createMock(Node.class);
-        final Node node4 = createMock(Node.class);
-        replay(node1);
-        replay(node2);
-        replay(node3);
-        replay(node4);
-
-        return new Node[]{node1, node2, node3, node4};
-}
+    @Test
+    public void testToArray() {
+        final List<Object> list = new ArrayList<>();
+        list.add(Integer.valueOf(1));
+        list.add("Two");
+        list.add(null);
+        final Object[] result = IteratorUtils.toArray(list.iterator());
+        assertEquals(list, Arrays.asList(result));
 
-    /**
-     * Creates a NodeList containing the specified nodes.
-     */
-    private NodeList createNodeList(final Node[] nodes) {
-        return new NodeList() {
-            @Override
-            public Node item(final int index) {
-                return nodes[index];
-            }
-            @Override
-            public int getLength() {
-                return nodes.length;
-            }
-        };
+        try {
+        	IteratorUtils.toArray(null);
+            fail("Expecting NullPointerException");
+        } catch (final NullPointerException ex) {
+            // success
+        }
     }
 
-    /**
-     * Tests methods collatedIterator(...)
-     */
     @Test
-    public void testCollatedIterator() {
+    public void testToArray2() {
+        final List<String> list = new ArrayList<>();
+        list.add("One");
+        list.add("Two");
+        list.add(null);
+        final String[] result = IteratorUtils.toArray(list.iterator(), String.class);
+        assertEquals(list, Arrays.asList(result));
+
         try {
-            IteratorUtils.collatedIterator(null, collectionOdd.iterator(), null);
-            fail("expecting NullPointerException");
-        } catch (NullPointerException npe) {
-            // expected
+        	IteratorUtils.toArray(list.iterator(), null);
+            fail("Expecting NullPointerException");
+        } catch (final NullPointerException ex) {
+            // success
         }
 
         try {
-            IteratorUtils.collatedIterator(null, null, collectionEven.iterator());
-            fail("expecting NullPointerException");
-        } catch (NullPointerException npe) {
-            // expected
+        	IteratorUtils.toArray(null, String.class);
+            fail("Expecting NullPointerException");
+        } catch (final NullPointerException ex) {
+            // success
         }
+    }
 
-        // natural ordering
-        Iterator<Integer> it = 
-                IteratorUtils.collatedIterator(null, collectionOdd.iterator(), collectionEven.iterator());
+    @Test
+    public void testToList() {
+        final List<Object> list = new ArrayList<>();
+        list.add(Integer.valueOf(1));
+        list.add("Two");
+        list.add(null);
+        final List<Object> result = IteratorUtils.toList(list.iterator());
+        assertEquals(list, result);
+    }
 
-        List<Integer> result = IteratorUtils.toList(it);
-        assertEquals(12, result.size());
+    @Test
+    public void testToListIterator() {
+        final List<Integer> list = new ArrayList<>();
+        list.add(Integer.valueOf(0));
+        list.add(Integer.valueOf(1));
+        list.add(Integer.valueOf(2));
+        final Iterator<Integer> iterator = list.iterator();
 
-        List<Integer> combinedList = new ArrayList<Integer>();
-        combinedList.addAll(collectionOdd);
-        combinedList.addAll(collectionEven);
-        Collections.sort(combinedList);
+        final ListIterator<Integer> liItr = IteratorUtils.toListIterator(iterator);
+        int expected = 0;
+        while(liItr.hasNext()){
+        	assertEquals(expected, liItr.next().intValue());
+        	++expected;
+        }
+    }
 
-        assertEquals(combinedList, result);
+    @Test
+    public void testToListIteratorNull() {
+        try {
+            IteratorUtils.toListIterator(null);
+            fail("Expecting NullPointerException");
+        } catch (final NullPointerException ex) {
+            // success
+        }
+    }
 
-        it = IteratorUtils.collatedIterator(null, collectionOdd.iterator(), emptyCollection.iterator());
-        result = IteratorUtils.toList(it);
-        assertEquals(collectionOdd, result);
+    /**
+     * Test remove() for an immutable Iterator.
+     */
+    @Test
+    public void testUnmodifiableIteratorImmutability() {
+        final Iterator<String> iterator = getImmutableIterator();
 
-        final Comparator<Integer> reverseComparator =
-                ComparatorUtils.reversedComparator(ComparatorUtils.<Integer>naturalComparator());
+        try {
+            iterator.remove();
+            // We shouldn't get to here.
+            fail("remove() should throw an UnsupportedOperationException");
+        } catch (final UnsupportedOperationException e) {
+            // This is correct; ignore the exception.
+        }
 
-        Collections.reverse(collectionOdd);
-        Collections.reverse(collectionEven);
-        Collections.reverse(combinedList);
+        iterator.next();
+
+        try {
+            iterator.remove();
+            // We shouldn't get to here.
+            fail("remove() should throw an UnsupportedOperationException");
+        } catch (final UnsupportedOperationException e) {
+            // This is correct; ignore the exception.
+        }
 
-        it = IteratorUtils.collatedIterator(reverseComparator,
-                                            collectionOdd.iterator(),
-                                            collectionEven.iterator());
-        result = IteratorUtils.toList(it);
-        assertEquals(combinedList, result);
     }
 
-    // -----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    /**
+     * Test next() and hasNext() for an immutable Iterator.
+     */
     @Test
-    public void forEach() {
-        final List<Integer> listA = new ArrayList<Integer>();
-        listA.add(1);
+    public void testUnmodifiableIteratorIteration() {
+        final Iterator<String> iterator = getImmutableIterator();
 
-        final List<Integer> listB = new ArrayList<Integer>();
-        listB.add(2);
+        assertTrue(iterator.hasNext());
 
-        final Closure<List<Integer>> testClosure = ClosureUtils.invokerClosure("clear");
-        final Collection<List<Integer>> col = new ArrayList<List<Integer>>();
-        col.add(listA);
-        col.add(listB);
-        IteratorUtils.forEach(col.iterator(), testClosure);
-        assertTrue(listA.isEmpty() && listB.isEmpty());
-        try {
-            IteratorUtils.forEach(col.iterator(), null);
-            fail("expecting NullPointerException");
-        } catch (NullPointerException npe) {
-            // expected
-        }
+        assertEquals("a", iterator.next());
 
-        IteratorUtils.forEach(null, testClosure);
+        assertTrue(iterator.hasNext());
 
-        // null should be OK
-        col.add(null);
-        IteratorUtils.forEach(col.iterator(), testClosure);
+        assertEquals("b", iterator.next());
+
+        assertTrue(iterator.hasNext());
+
+        assertEquals("c", iterator.next());
+
+        assertTrue(iterator.hasNext());
+
+        assertEquals("d", iterator.next());
+
+        assertTrue(!iterator.hasNext());
     }
 
+    /**
+     * Test remove() for an immutable ListIterator.
+     */
     @Test
-    public void forEachButLast() {
-        final List<Integer> listA = new ArrayList<Integer>();
-        listA.add(1);
+    public void testUnmodifiableListIteratorImmutability() {
+        final ListIterator<String> listIterator = getImmutableListIterator();
 
-        final List<Integer> listB = new ArrayList<Integer>();
-        listB.add(2);
+        try {
+            listIterator.remove();
+            // We shouldn't get to here.
+            fail("remove() should throw an UnsupportedOperationException");
+        } catch (final UnsupportedOperationException e) {
+            // This is correct; ignore the exception.
+        }
 
-        final Closure<List<Integer>> testClosure = ClosureUtils.invokerClosure("clear");
-        final Collection<List<Integer>> col = new ArrayList<List<Integer>>();
-        col.add(listA);
-        col.add(listB);
-        List<Integer> last = IteratorUtils.forEachButLast(col.iterator(), testClosure);
-        assertTrue(listA.isEmpty() && !listB.isEmpty());
-        assertSame(listB, last);
+        try {
+            listIterator.set("a");
+            // We shouldn't get to here.
+            fail("set(Object) should throw an UnsupportedOperationException");
+        } catch (final UnsupportedOperationException e) {
+            // This is correct; ignore the exception.
+        }
 
         try {
-            IteratorUtils.forEachButLast(col.iterator(), null);
-            fail("expecting NullPointerException");
-        } catch (NullPointerException npe) {
-            // expected
+            listIterator.add("a");
+            // We shouldn't get to here.
+            fail("add(Object) should throw an UnsupportedOperationException");
+        } catch (final UnsupportedOperationException e) {
+            // This is correct; ignore the exception.
         }
 
-        IteratorUtils.forEachButLast(null, testClosure);
+        listIterator.next();
 
-        // null should be OK
-        col.add(null);
-        col.add(null);
-        last = IteratorUtils.forEachButLast(col.iterator(), testClosure);
-        assertNull(last);
-    }
+        try {
+            listIterator.remove();
+            // We shouldn't get to here.
+            fail("remove() should throw an UnsupportedOperationException");
+        } catch (final UnsupportedOperationException e) {
+            // This is correct; ignore the exception.
+        }
 
-    @Test
-    public void find() {
-        Predicate<Number> testPredicate = equalPredicate((Number) 4);
-        Integer test = IteratorUtils.find(iterableA.iterator(), testPredicate);
-        assertTrue(test.equals(4));
-        testPredicate = equalPredicate((Number) 45);
-        test = IteratorUtils.find(iterableA.iterator(), testPredicate);
-        assertTrue(test == null);
-        assertNull(IteratorUtils.find(null,testPredicate));
         try {
-            assertNull(IteratorUtils.find(iterableA.iterator(), null));
-            fail("expecting NullPointerException");
-        } catch (final NullPointerException npe) {
-            // expected
+            listIterator.set("a");
+            // We shouldn't get to here.
+            fail("set(Object) should throw an UnsupportedOperationException");
+        } catch (final UnsupportedOperationException e) {
+            // This is correct; ignore the exception.
         }
-    }
 
-    @Test
-    public void indexOf() {
-        Predicate<Number> testPredicate = equalPredicate((Number) 4);
-        int index = IteratorUtils.indexOf(iterableA.iterator(), testPredicate);
-        assertEquals(6, index);
-        testPredicate = equalPredicate((Number) 45);
-        index = IteratorUtils.indexOf(iterableA.iterator(), testPredicate);
-        assertEquals(-1, index);
-        assertEquals(-1, IteratorUtils.indexOf(null, testPredicate));
         try {
-            assertNull(IteratorUtils.indexOf(iterableA.iterator(), null));
-            fail("expecting NullPointerException");
-        } catch (final NullPointerException npe) {
-            // expected
+            listIterator.add("a");
+            // We shouldn't get to here.
+            fail("add(Object) should throw an UnsupportedOperationException");
+        } catch (final UnsupportedOperationException e) {
+            // This is correct; ignore the exception.
         }
     }
 
+    /**
+     * Test next(), hasNext(), previous() and hasPrevious() for an immutable
+     * ListIterator.
+     */
     @Test
-    public void getFromIterator() throws Exception {
-        // Iterator, entry exists
-        Iterator<Integer> iterator = iterableA.iterator();
-        assertEquals(1, (int) IteratorUtils.get(iterator, 0));
-        iterator = iterableA.iterator();
-        assertEquals(2, (int) IteratorUtils.get(iterator, 1));
+    public void testUnmodifiableListIteratorIteration() {
+        final ListIterator<String> listIterator = getImmutableListIterator();
 
-        // Iterator, non-existent entry
-        try {
-            IteratorUtils.get(iterator, 10);
-            fail("Expecting IndexOutOfBoundsException.");
-        } catch (final IndexOutOfBoundsException e) {
-            // expected
-        }
-        assertTrue(!iterator.hasNext());
+        assertTrue(!listIterator.hasPrevious());
+        assertTrue(listIterator.hasNext());
+
+        assertEquals("a", listIterator.next());
+
+        assertTrue(listIterator.hasPrevious());
+        assertTrue(listIterator.hasNext());
+
+        assertEquals("b", listIterator.next());
+
+        assertTrue(listIterator.hasPrevious());
+        assertTrue(listIterator.hasNext());
+
+        assertEquals("c", listIterator.next());
+
+        assertTrue(listIterator.hasPrevious());
+        assertTrue(listIterator.hasNext());
+
+        assertEquals("d", listIterator.next());
+
+        assertTrue(listIterator.hasPrevious());
+        assertTrue(!listIterator.hasNext());
+
+        assertEquals("d", listIterator.previous());
+
+        assertTrue(listIterator.hasPrevious());
+        assertTrue(listIterator.hasNext());
+
+        assertEquals("c", listIterator.previous());
+
+        assertTrue(listIterator.hasPrevious());
+        assertTrue(listIterator.hasNext());
+
+        assertEquals("b", listIterator.previous());
+
+        assertTrue(listIterator.hasPrevious());
+        assertTrue(listIterator.hasNext());
+
+        assertEquals("a", listIterator.previous());
+
+        assertTrue(!listIterator.hasPrevious());
+        assertTrue(listIterator.hasNext());
     }
 
 }
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/junit/AbstractAvailableLocalesTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/junit/AbstractAvailableLocalesTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/junit/AbstractAvailableLocalesTest.java	1970-01-01 00:00:00.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/junit/AbstractAvailableLocalesTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -0,0 +1,95 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.commons.collections4.junit;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
+
+import org.apache.commons.lang3.reflect.FieldUtils;
+import org.junit.Rule;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public abstract class AbstractAvailableLocalesTest {
+
+//    public static List<Object[]> combine(final Object[] objects, final List<Locale> locales) {
+//        final List<Object[]> result = new ArrayList<>(objects.length * locales.size());
+//        Arrays.stream(objects).forEachOrdered(object -> locales.stream().forEachOrdered(locale -> result.add(new Object[] { object, locale })));
+//        return result;
+//    }
+//
+//    public static List<Object[]> combine(final Object[] objects, final Locale[] locales) {
+//        final List<Object[]> result = new ArrayList<>(objects.length * locales.length);
+//        Arrays.stream(objects).forEachOrdered(object -> Arrays.stream(locales).forEachOrdered(locale -> result.add(new Object[] { object, locale })));
+//        return result;
+//    }
+
+//    public static List<Object[]> combineAvailableLocales(final Object[] objects) {
+//        return combine(objects, getSortedAvailableLocales());
+//    }
+//
+//    public static List<Object[]> combineDeclaredLocales(final Object[] objects) {
+//        return combine(objects, getSortedDeclaredLocales());
+//    }
+
+    @Parameters(name = "{0}")
+    public static Locale[] getSortedAvailableLocales() {
+        final Locale[] availableLocales = Locale.getAvailableLocales();
+        Arrays.sort(availableLocales, new ObjectToStringComparator());
+        return availableLocales;
+    }
+
+    public static List<Locale> getSortedDeclaredLocales() {
+        final Field[] allFields = FieldUtils.getAllFields(Locale.class);
+        final List<Locale> availableLocales = new ArrayList<>(allFields.length);
+        for (final Field field : allFields) {
+            final int modifiers = field.getModifiers();
+            if (field.getType() == Locale.class && Modifier.isStatic(modifiers) && Modifier.isPublic(modifiers)) {
+                try {
+                    availableLocales.add((Locale) field.get(Locale.class));
+                } catch (IllegalArgumentException | IllegalAccessException e) {
+                    throw new IllegalStateException("Field " + field, e);
+                }
+            }
+        }
+        Collections.sort(availableLocales, new ObjectToStringComparator());
+        return availableLocales;
+    }
+
+    private final Locale locale;
+
+    @Rule
+    public final SetDefaultLocaleTestRule rule;
+
+    public AbstractAvailableLocalesTest(final Locale locale)  {
+        super();
+        this.locale = locale;
+        this.rule = new SetDefaultLocaleTestRule(locale);
+    }
+
+    public Locale getLocale() {
+        return locale;
+    }
+}
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/junit/ObjectToStringComparator.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/junit/ObjectToStringComparator.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/junit/ObjectToStringComparator.java	1970-01-01 00:00:00.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/junit/ObjectToStringComparator.java	2018-07-08 00:18:18.000000000 +0000
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.commons.collections4.junit;
+
+import java.io.Serializable;
+import java.util.Comparator;
+
+public final class ObjectToStringComparator implements Comparator<Object>, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public int compare(final Object o1, final Object o2) {
+        if (o1 == null && o2 == null) {
+            return 0;
+        }
+        if (o1 == null) {
+            return 1;
+        }
+        if (o2 == null) {
+            return -1;
+        }
+        return o1.toString().compareTo(o2.toString());
+    }
+}
\ No newline at end of file
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/junit/SetDefaultLocaleTestRule.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/junit/SetDefaultLocaleTestRule.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/junit/SetDefaultLocaleTestRule.java	1970-01-01 00:00:00.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/junit/SetDefaultLocaleTestRule.java	2018-07-08 00:18:18.000000000 +0000
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.commons.collections4.junit;
+
+import java.util.Locale;
+
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
+
+/**
+ * Sets the default {@code Locale} to the given locale for the duration of the test.
+ */
+public class SetDefaultLocaleTestRule implements TestRule {
+
+    private final Locale locale;
+
+    public SetDefaultLocaleTestRule(final Locale locale) {
+        super();
+        this.locale = locale;
+    }
+
+    @Override
+    public Statement apply(final Statement base, final Description description) {
+        return new Statement() {
+            @Override
+            public void evaluate() throws Throwable {
+                final Locale savedLocale = Locale.getDefault();
+                Locale.setDefault(getLocale());
+                try {
+                    base.evaluate();
+                } finally {
+                    Locale.setDefault(savedLocale);
+                }
+            }
+        };
+    }
+
+    public Locale getLocale() {
+        return locale;
+    }
+
+}
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryTest.java	2013-11-11 13:22:32.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/keyvalue/AbstractMapEntryTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -19,7 +19,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.*;
 
 /**
  * Abstract tests that can be extended to test any Map.Entry implementation.
@@ -29,9 +30,8 @@
  * type being tested.
  *
  * @since 3.0
- * @version $Id: AbstractMapEntryTest.java 1540705 2013-11-11 13:22:32Z ebourg $
  */
-public abstract class AbstractMapEntryTest<K, V> extends TestCase {
+public abstract class AbstractMapEntryTest<K, V> {
 
     protected final String key = "name";
     protected final String value = "duke";
@@ -64,7 +64,7 @@
      * Makes a Map.Entry of a type that's known to work correctly.
      */
     public Map.Entry<K, V> makeKnownMapEntry(final K key, final V value) {
-        final Map<K, V> map = new HashMap<K, V>(1);
+        final Map<K, V> map = new HashMap<>(1);
         map.put(key, value);
         final Map.Entry<K, V> entry = map.entrySet().iterator().next();
         return entry;
@@ -72,6 +72,7 @@
 
     //-----------------------------------------------------------------------
     @SuppressWarnings("unchecked")
+    @Test
     public void testAccessorsAndMutators() {
         Map.Entry<K, V> entry = makeMapEntry((K) key, (V) value);
 
@@ -96,6 +97,7 @@
      */
 
     @SuppressWarnings("unchecked")
+    @Test
     public void testSelfReferenceHandling() {
         // test that #setValue does not permit
         //  the MapEntry to contain itself (and thus cause infinite recursion
@@ -121,6 +123,7 @@
     public abstract void testConstructors();
 
     @SuppressWarnings("unchecked")
+    @Test
     public void testEqualsAndHashCode() {
         // 1. test with object data
         Map.Entry<K, V> e1 = makeMapEntry((K) key, (V) value);
@@ -142,6 +145,7 @@
     }
 
     @SuppressWarnings("unchecked")
+    @Test
     public void testToString() {
         Map.Entry<K, V> entry = makeMapEntry((K) key, (V) value);
         assertTrue(entry.toString().equals(entry.getKey() + "=" + entry.getValue()));
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/keyvalue/DefaultKeyValueTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/keyvalue/DefaultKeyValueTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/keyvalue/DefaultKeyValueTest.java	2013-11-11 13:22:32.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/keyvalue/DefaultKeyValueTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -16,18 +16,19 @@
  */
 package org.apache.commons.collections4.keyvalue;
 
+import org.junit.Test;
+
 import java.util.HashMap;
 import java.util.Map;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.*;
 
 /**
  * Test the DefaultKeyValue class.
  *
  * @since 3.0
- * @version $Id: DefaultKeyValueTest.java 1540705 2013-11-11 13:22:32Z ebourg $
  */
-public class DefaultKeyValueTest<K, V> extends TestCase {
+public class DefaultKeyValueTest<K, V> {
 
     private final String key = "name";
     private final String value = "duke";
@@ -39,7 +40,7 @@
      * of the type being tested.
      */
     protected DefaultKeyValue<K, V> makeDefaultKeyValue() {
-        return new DefaultKeyValue<K, V>(null, null);
+        return new DefaultKeyValue<>(null, null);
     }
 
     /**
@@ -48,11 +49,12 @@
      * of the type being tested.
      */
     protected DefaultKeyValue<K, V> makeDefaultKeyValue(final K key, final V value) {
-        return new DefaultKeyValue<K, V>(key, value);
+        return new DefaultKeyValue<>(key, value);
     }
 
     //-----------------------------------------------------------------------
     @SuppressWarnings("unchecked")
+    @Test
     public void testAccessorsAndMutators() {
         final DefaultKeyValue<K, V> kv = makeDefaultKeyValue();
 
@@ -72,6 +74,7 @@
     }
 
     @SuppressWarnings("unchecked")
+    @Test
     public void testSelfReferenceHandling() {
         // test that #setKey and #setValue do not permit
         //  the KVP to contain itself (and thus cause infinite recursion
@@ -104,17 +107,18 @@
      * Subclasses should override this method to test their own constructors.
      */
     @SuppressWarnings("unchecked")
+    @Test
     public void testConstructors() {
         // 1. test default constructor
-        DefaultKeyValue<K, V> kv = new DefaultKeyValue<K, V>();
+        DefaultKeyValue<K, V> kv = new DefaultKeyValue<>();
         assertTrue(kv.getKey() == null && kv.getValue() == null);
 
         // 2. test key-value constructor
-        kv = new DefaultKeyValue<K, V>((K) key, (V) value);
+        kv = new DefaultKeyValue<>((K) key, (V) value);
         assertTrue(kv.getKey() == key && kv.getValue() == value);
 
         // 3. test copy constructor
-        final DefaultKeyValue<K, V> kv2 = new DefaultKeyValue<K, V>(kv);
+        final DefaultKeyValue<K, V> kv2 = new DefaultKeyValue<>(kv);
         assertTrue(kv2.getKey() == key && kv2.getValue() == value);
 
         // test that the KVPs are independent
@@ -124,11 +128,11 @@
         assertTrue(kv2.getKey() == key && kv2.getValue() == value);
 
         // 4. test Map.Entry constructor
-        final Map<K, V> map = new HashMap<K, V>();
+        final Map<K, V> map = new HashMap<>();
         map.put((K) key, (V) value);
         final Map.Entry<K, V> entry = map.entrySet().iterator().next();
 
-        kv = new DefaultKeyValue<K, V>(entry);
+        kv = new DefaultKeyValue<>(entry);
         assertTrue(kv.getKey() == key && kv.getValue() == value);
 
         // test that the KVP is independent of the Map.Entry
@@ -138,6 +142,7 @@
     }
 
     @SuppressWarnings("unchecked")
+    @Test
     public void testEqualsAndHashCode() {
         // 1. test with object data
         DefaultKeyValue<K, V> kv = makeDefaultKeyValue((K) key, (V) value);
@@ -157,6 +162,7 @@
     }
 
     @SuppressWarnings("unchecked")
+    @Test
     public void testToString() {
         DefaultKeyValue<K, V> kv = makeDefaultKeyValue((K) key, (V) value);
         assertTrue(kv.toString().equals(kv.getKey() + "=" + kv.getValue()));
@@ -167,10 +173,11 @@
     }
 
     @SuppressWarnings("unchecked")
+    @Test
     public void testToMapEntry() {
         final DefaultKeyValue<K, V> kv = makeDefaultKeyValue((K) key, (V) value);
 
-        final Map<K, V> map = new HashMap<K, V>();
+        final Map<K, V> map = new HashMap<>();
         map.put(kv.getKey(), kv.getValue());
         final Map.Entry<K, V> entry = map.entrySet().iterator().next();
 
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/keyvalue/DefaultMapEntryTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/keyvalue/DefaultMapEntryTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/keyvalue/DefaultMapEntryTest.java	2013-11-11 13:22:32.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/keyvalue/DefaultMapEntryTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -19,12 +19,14 @@
 import java.util.Map;
 
 import org.apache.commons.collections4.KeyValue;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
 
 /**
  * Test the DefaultMapEntry class.
  *
  * @since 3.0
- * @version $Id: DefaultMapEntryTest.java 1540705 2013-11-11 13:22:32Z ebourg $
  */
 public class DefaultMapEntryTest<K, V> extends AbstractMapEntryTest<K, V> {
 
@@ -36,7 +38,7 @@
      */
     @Override
     public Map.Entry<K, V> makeMapEntry() {
-        return new DefaultMapEntry<K, V>(null, null);
+        return new DefaultMapEntry<>(null, null);
     }
 
     /**
@@ -46,7 +48,7 @@
      */
     @Override
     public Map.Entry<K, V> makeMapEntry(final K key, final V value) {
-        return new DefaultMapEntry<K, V>(key, value);
+        return new DefaultMapEntry<>(key, value);
     }
 
     //-----------------------------------------------------------------------
@@ -56,19 +58,20 @@
      */
     @Override
     @SuppressWarnings("unchecked")
+    @Test
     public void testConstructors() {
         // 1. test key-value constructor
-        final Map.Entry<K, V> entry = new DefaultMapEntry<K, V>((K) key, (V) value);
+        final Map.Entry<K, V> entry = new DefaultMapEntry<>((K) key, (V) value);
         assertSame(key, entry.getKey());
         assertSame(value, entry.getValue());
 
         // 2. test pair constructor
-        final KeyValue<K, V> pair = new DefaultKeyValue<K, V>((K) key, (V) value);
+        final KeyValue<K, V> pair = new DefaultKeyValue<>((K) key, (V) value);
         assertSame(key, pair.getKey());
         assertSame(value, pair.getValue());
 
         // 3. test copy constructor
-        final Map.Entry<K, V> entry2 = new DefaultMapEntry<K, V>(entry);
+        final Map.Entry<K, V> entry2 = new DefaultMapEntry<>(entry);
         assertSame(key, entry2.getKey());
         assertSame(value, entry2.getValue());
 
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/keyvalue/MultiKeyTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/keyvalue/MultiKeyTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/keyvalue/MultiKeyTest.java	2015-09-28 08:53:44.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/keyvalue/MultiKeyTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -16,6 +16,9 @@
  */
 package org.apache.commons.collections4.keyvalue;
 
+import org.junit.Before;
+import org.junit.Test;
+
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -26,14 +29,13 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.*;
 
 /**
  * Unit tests for {@link org.apache.commons.collections4.keyvalue.MultiKey}.
  *
- * @version $Id: MultiKeyTest.java 1705620 2015-09-28 08:53:44Z tn $
  */
-public class MultiKeyTest extends TestCase {
+public class MultiKeyTest {
 
     Integer ONE = Integer.valueOf(1);
     Integer TWO = Integer.valueOf(2);
@@ -41,55 +43,47 @@
     Integer FOUR = Integer.valueOf(4);
     Integer FIVE = Integer.valueOf(5);
 
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-    }
-
     //-----------------------------------------------------------------------
+    @Test
     public void testConstructors() throws Exception {
         MultiKey<Integer> mk;
-        mk = new MultiKey<Integer>(ONE, TWO);
+        mk = new MultiKey<>(ONE, TWO);
         assertTrue(Arrays.equals(new Object[] { ONE, TWO }, mk.getKeys()));
 
-        mk = new MultiKey<Integer>(ONE, TWO, THREE);
+        mk = new MultiKey<>(ONE, TWO, THREE);
         assertTrue(Arrays.equals(new Object[] { ONE, TWO, THREE }, mk.getKeys()));
 
-        mk = new MultiKey<Integer>(ONE, TWO, THREE, FOUR);
+        mk = new MultiKey<>(ONE, TWO, THREE, FOUR);
         assertTrue(Arrays.equals(new Object[] { ONE, TWO, THREE, FOUR }, mk.getKeys()));
 
-        mk = new MultiKey<Integer>(ONE, TWO, THREE, FOUR, FIVE);
+        mk = new MultiKey<>(ONE, TWO, THREE, FOUR, FIVE);
         assertTrue(Arrays.equals(new Object[] { ONE, TWO, THREE, FOUR, FIVE }, mk.getKeys()));
 
-        mk = new MultiKey<Integer>(new Integer[] { THREE, FOUR, ONE, TWO }, false);
+        mk = new MultiKey<>(new Integer[] { THREE, FOUR, ONE, TWO }, false);
         assertTrue(Arrays.equals(new Object[] { THREE, FOUR, ONE, TWO }, mk.getKeys()));
     }
 
+    @Test
     public void testConstructorsByArray() throws Exception {
         MultiKey<Integer> mk;
         Integer[] keys = new Integer[] { THREE, FOUR, ONE, TWO };
-        mk = new MultiKey<Integer>(keys);
+        mk = new MultiKey<>(keys);
         assertTrue(Arrays.equals(new Object[] { THREE, FOUR, ONE, TWO }, mk.getKeys()));
         keys[3] = FIVE;  // no effect
         assertTrue(Arrays.equals(new Object[] { THREE, FOUR, ONE, TWO }, mk.getKeys()));
 
         keys = new Integer[] {};
-        mk = new MultiKey<Integer>(keys);
+        mk = new MultiKey<>(keys);
         assertTrue(Arrays.equals(new Object[] {}, mk.getKeys()));
 
         keys = new Integer[] { THREE, FOUR, ONE, TWO };
-        mk = new MultiKey<Integer>(keys, true);
+        mk = new MultiKey<>(keys, true);
         assertTrue(Arrays.equals(new Object[] { THREE, FOUR, ONE, TWO }, mk.getKeys()));
         keys[3] = FIVE;  // no effect
         assertTrue(Arrays.equals(new Object[] { THREE, FOUR, ONE, TWO }, mk.getKeys()));
 
         keys = new Integer[] { THREE, FOUR, ONE, TWO };
-        mk = new MultiKey<Integer>(keys, false);
+        mk = new MultiKey<>(keys, false);
         assertTrue(Arrays.equals(new Object[] { THREE, FOUR, ONE, TWO }, mk.getKeys()));
         // change key - don't do this!
         // the hashcode of the MultiKey is now broken
@@ -97,40 +91,43 @@
         assertTrue(Arrays.equals(new Object[] { THREE, FOUR, ONE, FIVE }, mk.getKeys()));
     }
 
+    @Test
     public void testConstructorsByArrayNull() throws Exception {
         final Integer[] keys = null;
         try {
-            new MultiKey<Integer>(keys);
+            new MultiKey<>(keys);
             fail();
         } catch (final IllegalArgumentException ex) {}
         try {
-            new MultiKey<Integer>(keys, true);
+            new MultiKey<>(keys, true);
             fail();
         } catch (final IllegalArgumentException ex) {}
         try {
-            new MultiKey<Integer>(keys, false);
+            new MultiKey<>(keys, false);
             fail();
         } catch (final IllegalArgumentException ex) {}
     }
 
+    @Test
     public void testSize() {
-        assertEquals(2, new MultiKey<Integer>(ONE, TWO).size());
-        assertEquals(2, new MultiKey<Object>(null, null).size());
-        assertEquals(3, new MultiKey<Integer>(ONE, TWO, THREE).size());
-        assertEquals(3, new MultiKey<Object>(null, null, null).size());
-        assertEquals(4, new MultiKey<Integer>(ONE, TWO, THREE, FOUR).size());
-        assertEquals(4, new MultiKey<Object>(null, null, null, null).size());
-        assertEquals(5, new MultiKey<Integer>(ONE, TWO, THREE, FOUR, FIVE).size());
-        assertEquals(5, new MultiKey<Object>(null, null, null, null, null).size());
-
-        assertEquals(0, new MultiKey<Object>(new Object[] {}).size());
-        assertEquals(1, new MultiKey<Integer>(new Integer[] { ONE }).size());
-        assertEquals(2, new MultiKey<Integer>(new Integer[] { ONE, TWO }).size());
-        assertEquals(7, new MultiKey<Integer>(new Integer[] { ONE, TWO, ONE, TWO, ONE, TWO, ONE }).size());
+        assertEquals(2, new MultiKey<>(ONE, TWO).size());
+        assertEquals(2, new MultiKey<>(null, null).size());
+        assertEquals(3, new MultiKey<>(ONE, TWO, THREE).size());
+        assertEquals(3, new MultiKey<>(null, null, null).size());
+        assertEquals(4, new MultiKey<>(ONE, TWO, THREE, FOUR).size());
+        assertEquals(4, new MultiKey<>(null, null, null, null).size());
+        assertEquals(5, new MultiKey<>(ONE, TWO, THREE, FOUR, FIVE).size());
+        assertEquals(5, new MultiKey<>(null, null, null, null, null).size());
+
+        assertEquals(0, new MultiKey<>(new Object[] {}).size());
+        assertEquals(1, new MultiKey<>(new Integer[] { ONE }).size());
+        assertEquals(2, new MultiKey<>(new Integer[] { ONE, TWO }).size());
+        assertEquals(7, new MultiKey<>(new Integer[] { ONE, TWO, ONE, TWO, ONE, TWO, ONE }).size());
     }
 
+    @Test
     public void testGetIndexed() {
-        final MultiKey<Integer> mk = new MultiKey<Integer>(ONE, TWO);
+        final MultiKey<Integer> mk = new MultiKey<>(ONE, TWO);
         assertSame(ONE, mk.getKey(0));
         assertSame(TWO, mk.getKey(1));
         try {
@@ -143,17 +140,19 @@
         } catch (final IndexOutOfBoundsException ex) {}
     }
 
+    @Test
     public void testGetKeysSimpleConstructor() {
-        final MultiKey<Integer> mk = new MultiKey<Integer>(ONE, TWO);
+        final MultiKey<Integer> mk = new MultiKey<>(ONE, TWO);
         final Object[] array = mk.getKeys();
         assertSame(ONE, array[0]);
         assertSame(TWO, array[1]);
         assertEquals(2, array.length);
     }
 
+    @Test
     public void testGetKeysArrayConstructorCloned() {
         final Integer[] keys = new Integer[] { ONE, TWO };
-        final MultiKey<Integer> mk = new MultiKey<Integer>(keys, true);
+        final MultiKey<Integer> mk = new MultiKey<>(keys, true);
         final Object[] array = mk.getKeys();
         assertTrue(array != keys);
         assertTrue(Arrays.equals(array, keys));
@@ -162,9 +161,10 @@
         assertEquals(2, array.length);
     }
 
+    @Test
     public void testGetKeysArrayConstructorNonCloned() {
         final Integer[] keys = new Integer[] { ONE, TWO };
-        final MultiKey<Integer> mk = new MultiKey<Integer>(keys, false);
+        final MultiKey<Integer> mk = new MultiKey<>(keys, false);
         final Object[] array = mk.getKeys();
         assertTrue(array != keys);  // still not equal
         assertTrue(Arrays.equals(array, keys));
@@ -173,9 +173,10 @@
         assertEquals(2, array.length);
     }
 
+    @Test
     public void testHashCode() {
-        final MultiKey<Integer> mk1 = new MultiKey<Integer>(ONE, TWO);
-        final MultiKey<Integer> mk2 = new MultiKey<Integer>(ONE, TWO);
+        final MultiKey<Integer> mk1 = new MultiKey<>(ONE, TWO);
+        final MultiKey<Integer> mk2 = new MultiKey<>(ONE, TWO);
         final MultiKey<Object> mk3 = new MultiKey<Object>(ONE, "TWO");
 
         assertTrue(mk1.hashCode() == mk1.hashCode());
@@ -186,9 +187,10 @@
         assertEquals(total, mk1.hashCode());
     }
 
+    @Test
     public void testEquals() {
-        final MultiKey<Integer> mk1 = new MultiKey<Integer>(ONE, TWO);
-        final MultiKey<Integer> mk2 = new MultiKey<Integer>(ONE, TWO);
+        final MultiKey<Integer> mk1 = new MultiKey<>(ONE, TWO);
+        final MultiKey<Integer> mk2 = new MultiKey<>(ONE, TWO);
         final MultiKey<Object> mk3 = new MultiKey<Object>(ONE, "TWO");
 
         assertEquals(mk1, mk1);
@@ -228,11 +230,12 @@
         }
     }
 
+    @Test
     public void testEqualsAfterSerialization() throws IOException, ClassNotFoundException
     {
         SystemHashCodeSimulatingKey sysKey = new SystemHashCodeSimulatingKey("test");
         final MultiKey<?> mk = new MultiKey<Object>(ONE, sysKey);
-        final Map<MultiKey<?>, Integer> map = new HashMap<MultiKey<?>, Integer>();
+        final Map<MultiKey<?>, Integer> map = new HashMap<>();
         map.put(mk, TWO);
 
         // serialize
@@ -254,12 +257,12 @@
         final MultiKey<?> mk2 = new MultiKey<Object>(ONE, sysKey);
         assertEquals(TWO, map2.get(mk2));
     }
-    
+
     static class DerivedMultiKey<T> extends MultiKey<T> {
 
         private static final long serialVersionUID = 1928896152249821416L;
 
-        public DerivedMultiKey(T key1, T key2) {
+        public DerivedMultiKey(final T key1, final T key2) {
             super(key1, key2);
         }
 
@@ -273,9 +276,10 @@
 
     }
 
+    @Test
     public void testEqualsAfterSerializationOfDerivedClass() throws IOException, ClassNotFoundException
     {
-        final DerivedMultiKey<?> mk = new DerivedMultiKey<String>("A", "B");
+        final DerivedMultiKey<?> mk = new DerivedMultiKey<>("A", "B");
 
         // serialize
         final ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -291,5 +295,5 @@
 
         assertEquals(mk.hashCode(), mk2.hashCode());
     }
-    
+
 }
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/keyvalue/TiedMapEntryTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/keyvalue/TiedMapEntryTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/keyvalue/TiedMapEntryTest.java	2013-11-11 13:22:32.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/keyvalue/TiedMapEntryTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -16,14 +16,16 @@
  */
 package org.apache.commons.collections4.keyvalue;
 
+import org.junit.Test;
+
 import java.util.HashMap;
 import java.util.Map;
+import static org.junit.Assert.*;
 
 /**
  * Test the TiedMapEntry class.
  *
  * @since 3.0
- * @version $Id: TiedMapEntryTest.java 1540705 2013-11-11 13:22:32Z ebourg $
  */
 public class TiedMapEntryTest<K, V> extends AbstractMapEntryTest<K, V> {
 
@@ -33,9 +35,9 @@
      */
     @Override
     public Map.Entry<K, V> makeMapEntry(final K key, final V value) {
-        final Map<K, V> map = new HashMap<K, V>();
+        final Map<K, V> map = new HashMap<>();
         map.put(key, value);
-        return new TiedMapEntry<K, V>(map, key);
+        return new TiedMapEntry<>(map, key);
     }
 
     //-----------------------------------------------------------------------
@@ -43,6 +45,7 @@
      * Tests the constructors.
      */
     @Override
+    @Test
     public void testConstructors() {
         // ignore
     }
@@ -51,26 +54,27 @@
      * Tests the constructors.
      */
     @SuppressWarnings("unchecked")
+    @Test
     public void testSetValue() {
-        final Map<K, V> map = new HashMap<K, V>();
+        final Map<K, V> map = new HashMap<>();
         map.put((K) "A", (V) "a");
         map.put((K) "B", (V) "b");
         map.put((K) "C", (V) "c");
-        Map.Entry<K, V> entry = new TiedMapEntry<K, V>(map, (K) "A");
+        Map.Entry<K, V> entry = new TiedMapEntry<>(map, (K) "A");
         assertSame("A", entry.getKey());
         assertSame("a", entry.getValue());
         assertSame("a", entry.setValue((V) "x"));
         assertSame("A", entry.getKey());
         assertSame("x", entry.getValue());
 
-        entry = new TiedMapEntry<K, V>(map, (K) "B");
+        entry = new TiedMapEntry<>(map, (K) "B");
         assertSame("B", entry.getKey());
         assertSame("b", entry.getValue());
         assertSame("b", entry.setValue((V) "y"));
         assertSame("B", entry.getKey());
         assertSame("y", entry.getValue());
 
-        entry = new TiedMapEntry<K, V>(map, (K) "C");
+        entry = new TiedMapEntry<>(map, (K) "C");
         assertSame("C", entry.getKey());
         assertSame("c", entry.getValue());
         assertSame("c", entry.setValue((V) "z"));
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntryTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntryTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntryTest.java	2013-11-11 13:22:32.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/keyvalue/UnmodifiableMapEntryTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -20,12 +20,14 @@
 
 import org.apache.commons.collections4.KeyValue;
 import org.apache.commons.collections4.Unmodifiable;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
 
 /**
  * Test the UnmodifiableMapEntry class.
  *
  * @since 3.0
- * @version $Id: UnmodifiableMapEntryTest.java 1540705 2013-11-11 13:22:32Z ebourg $
  */
 public class UnmodifiableMapEntryTest<K, V> extends AbstractMapEntryTest<K, V> {
 
@@ -37,7 +39,7 @@
      */
     @Override
     public Map.Entry<K, V> makeMapEntry() {
-        return new UnmodifiableMapEntry<K, V>(null, null);
+        return new UnmodifiableMapEntry<>(null, null);
     }
 
     /**
@@ -47,7 +49,7 @@
      */
     @Override
     public Map.Entry<K, V> makeMapEntry(final K key, final V value) {
-        return new UnmodifiableMapEntry<K, V>(key, value);
+        return new UnmodifiableMapEntry<>(key, value);
     }
 
     //-----------------------------------------------------------------------
@@ -57,20 +59,21 @@
      */
     @Override
     @SuppressWarnings("unchecked")
+    @Test
     public void testConstructors() {
         // 1. test key-value constructor
-        Map.Entry<K, V> entry = new UnmodifiableMapEntry<K, V>((K) key, (V) value);
+        Map.Entry<K, V> entry = new UnmodifiableMapEntry<>((K) key, (V) value);
         assertSame(key, entry.getKey());
         assertSame(value, entry.getValue());
 
         // 2. test pair constructor
-        final KeyValue<K, V> pair = new DefaultKeyValue<K, V>((K) key, (V) value);
-        entry = new UnmodifiableMapEntry<K, V>(pair);
+        final KeyValue<K, V> pair = new DefaultKeyValue<>((K) key, (V) value);
+        entry = new UnmodifiableMapEntry<>(pair);
         assertSame(key, entry.getKey());
         assertSame(value, entry.getValue());
 
         // 3. test copy constructor
-        final Map.Entry<K, V> entry2 = new UnmodifiableMapEntry<K, V>(entry);
+        final Map.Entry<K, V> entry2 = new UnmodifiableMapEntry<>(entry);
         assertSame(key, entry2.getKey());
         assertSame(value, entry2.getValue());
 
@@ -92,10 +95,12 @@
     }
 
     @Override
+    @Test
     public void testSelfReferenceHandling() {
         // block
     }
 
+    @Test
     public void testUnmodifiable() {
         final Map.Entry<K, V> entry = makeMapEntry();
         try {
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/list/AbstractLinkedListTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/list/AbstractLinkedListTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/list/AbstractLinkedListTest.java	2013-11-11 21:58:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/list/AbstractLinkedListTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -21,7 +21,6 @@
 /**
  * Test case for {@link AbstractLinkedList}.
  *
- * @version $Id: AbstractLinkedListTest.java 1540860 2013-11-11 21:58:27Z ebourg $
  */
 public abstract class AbstractLinkedListTest<E> extends AbstractListTest<E> {
 
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/list/AbstractListTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/list/AbstractListTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/list/AbstractListTest.java	2013-11-11 21:58:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/list/AbstractListTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -46,7 +46,6 @@
  * test case (method) your {@link List} fails or override one of the
  * protected methods from AbstractCollectionTest.
  *
- * @version $Id: AbstractListTest.java 1540860 2013-11-11 21:58:27Z ebourg $
  */
 public abstract class AbstractListTest<E> extends AbstractCollectionTest<E> {
 
@@ -120,7 +119,7 @@
      */
     @Override
     public Collection<E> makeConfirmedCollection() {
-        final ArrayList<E> list = new ArrayList<E>();
+        final ArrayList<E> list = new ArrayList<>();
         return list;
     }
 
@@ -129,7 +128,7 @@
      */
     @Override
     public Collection<E> makeConfirmedFullCollection() {
-        final ArrayList<E> list = new ArrayList<E>();
+        final ArrayList<E> list = new ArrayList<>();
         list.addAll(Arrays.asList(getFullElements()));
         return list;
     }
@@ -323,7 +322,7 @@
             // main list is only size 1, so lets add other elements to get a better list
             list.addAll(Arrays.asList(getOtherElements()));
             getConfirmed().addAll(Arrays.asList(getOtherElements()));
-            list2 = new ArrayList<E>(list2);
+            list2 = new ArrayList<>(list2);
             list2.addAll(Arrays.asList(getOtherElements()));
         }
         if (list2.size() > 1) {
@@ -473,7 +472,7 @@
         final List<E> list1 = getCollection();
         final List<E> list2 = getConfirmed();
 
-        for (E element : list2) {
+        for (final E element : list2) {
             assertEquals("indexOf should return correct result",
                     list1.indexOf(element), list2.indexOf(element));
             verify();
@@ -1133,7 +1132,7 @@
         if (getFullElements().length - 6 < 10) {
             return null;
         }
-        return new BulkTestSubList<E>(this);
+        return new BulkTestSubList<>(this);
     }
 
    public static class BulkTestSubList<E> extends AbstractListTest<E> {
@@ -1338,9 +1337,8 @@
            if (t instanceof ConcurrentModificationException) {
                // expected
                return;
-           } else {
-               fail(m.getName() + " raised unexpected " + e);
            }
+        fail(m.getName() + " raised unexpected " + e);
        }
    }
 
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/list/CursorableLinkedListTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/list/CursorableLinkedListTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/list/CursorableLinkedListTest.java	2013-11-19 00:51:43.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/list/CursorableLinkedListTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -32,7 +32,6 @@
 /**
  * Test class.
  *
- * @version $Id: CursorableLinkedListTest.java 1543270 2013-11-19 00:51:43Z ggregory $
  */
 public class CursorableLinkedListTest<E> extends AbstractLinkedListTest<E> {
     public CursorableLinkedListTest(final String testName) {
@@ -47,12 +46,12 @@
 
     @Override
     public void setUp() {
-        list = new CursorableLinkedList<E>();
+        list = new CursorableLinkedList<>();
     }
 
     @Override
     public CursorableLinkedList<E> makeObject() {
-        return new CursorableLinkedList<E>();
+        return new CursorableLinkedList<>();
     }
 
     @SuppressWarnings("unchecked")
@@ -75,7 +74,7 @@
         list.add(7,(E) Integer.valueOf(5));
         assertEquals("[-2, -1, 0, 1, 2, 3, 4, 5]",list.toString());
 
-        final List<E> list2 = new LinkedList<E>();
+        final List<E> list2 = new LinkedList<>();
         list2.add((E) "A");
         list2.add((E) "B");
         list2.add((E) "C");
@@ -140,7 +139,7 @@
     @SuppressWarnings("unchecked")
     public void testContainsAll() {
         assertTrue(list.containsAll(list));
-        final java.util.List<E> list2 = new java.util.LinkedList<E>();
+        final java.util.List<E> list2 = new java.util.LinkedList<>();
         assertTrue(list.containsAll(list2));
         list2.add((E) "A");
         assertTrue(!list.containsAll(list2));
@@ -836,11 +835,11 @@
         assertTrue(list.equals(list));
         assertEquals(list.hashCode(),list.hashCode());
 
-        final CursorableLinkedList<E> list2 = new CursorableLinkedList<E>();
+        final CursorableLinkedList<E> list2 = new CursorableLinkedList<>();
         assertTrue(!list.equals(list2));
         assertTrue(!list2.equals(list));
 
-        final java.util.List<E> list3 = new java.util.LinkedList<E>();
+        final java.util.List<E> list3 = new java.util.LinkedList<>();
         assertTrue(!list.equals(list3));
         assertTrue(!list3.equals(list));
         assertTrue(list2.equals(list3));
@@ -1178,7 +1177,7 @@
         list.add((E) "4");
         list.add((E) "5");
 
-        final HashSet<E> set = new HashSet<E>();
+        final HashSet<E> set = new HashSet<>();
         set.add((E) "A");
         set.add((E) "2");
         set.add((E) "C");
@@ -1260,7 +1259,7 @@
         list.add((E) "5");
         list.add((E) "5");
 
-        final HashSet<E> set = new HashSet<E>();
+        final HashSet<E> set = new HashSet<>();
         set.add((E) "A");
         set.add((E) "2");
         set.add((E) "C");
@@ -1501,7 +1500,7 @@
      */
     @Override
     public String[] ignoredTests() {
-        final ArrayList<String> list = new ArrayList<String>();
+        final ArrayList<String> list = new ArrayList<>();
         final String prefix = "CursorableLinkedListTest";
         final String bulk = ".bulkTestSubList";
         final String[] ignored = new String[] {
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/list/FixedSizeListTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/list/FixedSizeListTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/list/FixedSizeListTest.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/list/FixedSizeListTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -25,7 +25,6 @@
  * implementation.
  *
  * @since 3.0
- * @version $Id: FixedSizeListTest.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 public class FixedSizeListTest<E> extends AbstractListTest<E> {
 
@@ -40,7 +39,7 @@
 
     @Override
     public List<E> makeFullCollection() {
-        final List<E> list = new ArrayList<E>();
+        final List<E> list = new ArrayList<>();
         list.addAll(Arrays.asList(getFullElements()));
         return FixedSizeList.fixedSizeList(list);
     }
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/list/GrowthListTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/list/GrowthListTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/list/GrowthListTest.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/list/GrowthListTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -25,7 +25,6 @@
  * Extension of {@link AbstractListTest} for exercising the {@link GrowthList}.
  *
  * @since 3.2
- * @version $Id: GrowthListTest.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 public class GrowthListTest<E> extends AbstractListTest<E> {
 
@@ -35,12 +34,12 @@
 
     @Override
     public List<E> makeObject() {
-        return new GrowthList<E>();
+        return new GrowthList<>();
     }
 
     @Override
     public List<E> makeFullCollection() {
-        final List<E> list = new ArrayList<E>();
+        final List<E> list = new ArrayList<>();
         list.addAll(Arrays.asList(getFullElements()));
         return GrowthList.growthList(list);
     }
@@ -48,7 +47,7 @@
     //-----------------------------------------------------------------------
     public void testGrowthAdd() {
         final Integer one = Integer.valueOf(1);
-        final GrowthList<Integer> grower = new GrowthList<Integer>();
+        final GrowthList<Integer> grower = new GrowthList<>();
         assertEquals(0, grower.size());
         grower.add(1, one);
         assertEquals(2, grower.size());
@@ -59,10 +58,10 @@
     public void testGrowthAddAll() {
         final Integer one = Integer.valueOf(1);
         final Integer two = Integer.valueOf(2);
-        final Collection<Integer> coll = new ArrayList<Integer>();
+        final Collection<Integer> coll = new ArrayList<>();
         coll.add(one);
         coll.add(two);
-        final GrowthList<Integer> grower = new GrowthList<Integer>();
+        final GrowthList<Integer> grower = new GrowthList<>();
         assertEquals(0, grower.size());
         grower.addAll(1, coll);
         assertEquals(3, grower.size());
@@ -73,7 +72,7 @@
 
     public void testGrowthSet1() {
         final Integer one = Integer.valueOf(1);
-        final GrowthList<Integer> grower = new GrowthList<Integer>();
+        final GrowthList<Integer> grower = new GrowthList<>();
         assertEquals(0, grower.size());
         grower.set(1, one);
         assertEquals(2, grower.size());
@@ -83,7 +82,7 @@
 
     public void testGrowthSet2() {
         final Integer one = Integer.valueOf(1);
-        final GrowthList<Integer> grower = new GrowthList<Integer>();
+        final GrowthList<Integer> grower = new GrowthList<>();
         assertEquals(0, grower.size());
         grower.set(0, one);
         assertEquals(1, grower.size());
@@ -150,7 +149,7 @@
             fail("List.set should throw IndexOutOfBoundsException [-1]");
         } catch(final IndexOutOfBoundsException e) {
             // expected
-        } 
+        }
     }
 
     //-----------------------------------------------------------------------
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/list/NodeCachingLinkedListTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/list/NodeCachingLinkedListTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/list/NodeCachingLinkedListTest.java	2013-11-11 21:58:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/list/NodeCachingLinkedListTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -26,7 +26,6 @@
 /**
  * Test class for NodeCachingLinkedList, a performance optimised LinkedList.
  *
- * @version $Id: NodeCachingLinkedListTest.java 1540860 2013-11-11 21:58:27Z ebourg $
  */
 public class NodeCachingLinkedListTest<E> extends AbstractLinkedListTest<E> {
 
@@ -41,7 +40,7 @@
     //-----------------------------------------------------------------------
     @Override
     public NodeCachingLinkedList<E> makeObject() {
-        return new NodeCachingLinkedList<E>();
+        return new NodeCachingLinkedList<>();
     }
 
     @Override
@@ -73,8 +72,8 @@
 
     //-----------------------------------------------------------------------
     public static void compareSpeed() {
-        final NodeCachingLinkedList<Object> ncll = new NodeCachingLinkedList<Object>();
-        final LinkedList<Object> ll = new LinkedList<Object>();
+        final NodeCachingLinkedList<Object> ncll = new NodeCachingLinkedList<>();
+        final LinkedList<Object> ll = new LinkedList<>();
 
         final Object o1 = new Object();
         final Object o2 = new Object();
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/list/PredicatedListTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/list/PredicatedListTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/list/PredicatedListTest.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/list/PredicatedListTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -23,11 +23,10 @@
 import org.apache.commons.collections4.functors.TruePredicate;
 
 /**
- * Extension of {@link AbstractListTest} for exercising the 
+ * Extension of {@link AbstractListTest} for exercising the
  * {@link PredicatedList} implementation.
  *
  * @since 3.0
- * @version $Id: PredicatedListTest.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 public class PredicatedListTest<E> extends AbstractListTest<E> {
 
@@ -58,6 +57,7 @@
 
     protected Predicate<E> testPredicate =
         new Predicate<E>() {
+            @Override
             public boolean evaluate(final E o) {
                 return o instanceof String;
             }
@@ -84,7 +84,7 @@
     @SuppressWarnings("unchecked")
     public void testIllegalAddAll() {
         final List<E> list = makeTestList();
-        final List<E> elements = new ArrayList<E>();
+        final List<E> elements = new ArrayList<>();
         elements.add((E) "one");
         elements.add((E) "two");
         elements.add((E) Integer.valueOf(3));
@@ -120,7 +120,7 @@
     public void testLegalAddAll() {
         final List<E> list = makeTestList();
         list.add((E) "zero");
-        final List<E> elements = new ArrayList<E>();
+        final List<E> elements = new ArrayList<>();
         elements.add((E) "one");
         elements.add((E) "two");
         elements.add((E) "three");
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/list/SetUniqueListTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/list/SetUniqueListTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/list/SetUniqueListTest.java	2015-01-27 15:09:02.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/list/SetUniqueListTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -29,7 +29,6 @@
  * JUnit tests.
  *
  * @since 3.0
- * @version $Id: SetUniqueListTest.java 1655062 2015-01-27 15:09:02Z tn $
  */
 public class SetUniqueListTest<E> extends AbstractListTest<E> {
 
@@ -40,7 +39,7 @@
     //-----------------------------------------------------------------------
     @Override
     public List<E> makeObject() {
-        return new SetUniqueList<E>(new ArrayList<E>(), new HashSet<E>());
+        return new SetUniqueList<>(new ArrayList<E>(), new HashSet<E>());
     }
 
     //-----------------------------------------------------------------------
@@ -141,7 +140,7 @@
 
     public void testIntCollectionAddAll() {
       // make a SetUniqueList with one element
-      final List<Integer> list = new SetUniqueList<Integer>(new ArrayList<Integer>(), new HashSet<Integer>());
+      final List<Integer> list = new SetUniqueList<>(new ArrayList<Integer>(), new HashSet<Integer>());
       final Integer existingElement = Integer.valueOf(1);
       list.add(existingElement);
 
@@ -210,7 +209,7 @@
     //-----------------------------------------------------------------------
     public void testFactory() {
         final Integer[] array = new Integer[] { Integer.valueOf(1), Integer.valueOf(2), Integer.valueOf(1) };
-        final ArrayList<Integer> list = new ArrayList<Integer>(Arrays.asList(array));
+        final ArrayList<Integer> list = new ArrayList<>(Arrays.asList(array));
         final SetUniqueList<Integer> lset = SetUniqueList.setUniqueList(list);
 
         assertEquals("Duplicate element was added.", 2, lset.size());
@@ -222,7 +221,7 @@
 
     @SuppressWarnings("unchecked")
     public void testAdd() {
-        final SetUniqueList<E> lset = new SetUniqueList<E>(new ArrayList<E>(), new HashSet<E>());
+        final SetUniqueList<E> lset = new SetUniqueList<>(new ArrayList<E>(), new HashSet<E>());
 
         // Duplicate element
         final E obj = (E) Integer.valueOf(1);
@@ -237,7 +236,7 @@
 
     @SuppressWarnings("unchecked")
     public void testAddAll() {
-        final SetUniqueList<E> lset = new SetUniqueList<E>(new ArrayList<E>(), new HashSet<E>());
+        final SetUniqueList<E> lset = new SetUniqueList<>(new ArrayList<E>(), new HashSet<E>());
 
         lset.addAll(
             Arrays.asList((E[]) new Integer[] { Integer.valueOf(1), Integer.valueOf(1)}));
@@ -247,7 +246,7 @@
 
     @SuppressWarnings("unchecked")
     public void testSet() {
-        final SetUniqueList<E> lset = new SetUniqueList<E>(new ArrayList<E>(), new HashSet<E>());
+        final SetUniqueList<E> lset = new SetUniqueList<>(new ArrayList<E>(), new HashSet<E>());
 
         // Duplicate element
         final E obj1 = (E) Integer.valueOf(1);
@@ -286,7 +285,7 @@
 
     @SuppressWarnings("unchecked")
     public void testListIterator() {
-        final SetUniqueList<E> lset = new SetUniqueList<E>(new ArrayList<E>(), new HashSet<E>());
+        final SetUniqueList<E> lset = new SetUniqueList<>(new ArrayList<E>(), new HashSet<E>());
 
         final E obj1 = (E) Integer.valueOf(1);
         final E obj2 = (E) Integer.valueOf(2);
@@ -346,9 +345,9 @@
          * set(0,b): [b]->a
          * So UniqList contains [b] and a is returned
          */
-        final ArrayList<E> l = new ArrayList<E>();
-        final HashSet<E> s = new HashSet<E>();
-        final SetUniqueList<E> ul = new SetUniqueList<E>(l, s);
+        final ArrayList<E> l = new ArrayList<>();
+        final HashSet<E> s = new HashSet<>();
+        final SetUniqueList<E> ul = new SetUniqueList<>(l, s);
 
         final E a = (E) new Object();
         final E b = (E) new Object();
@@ -375,9 +374,9 @@
          * set(0,b): [b,c]->a
          * So UniqList contains [b,c] and a is returned
          */
-        final ArrayList<E> l = new ArrayList<E>();
-        final HashSet<E> s = new HashSet<E>();
-        final SetUniqueList<E> ul = new SetUniqueList<E>(l, s);
+        final ArrayList<E> l = new ArrayList<>();
+        final HashSet<E> s = new HashSet<>();
+        final SetUniqueList<E> ul = new SetUniqueList<>(l, s);
 
         final E a = (E) new Object();
         final E b = (E) new Object();
@@ -411,9 +410,9 @@
          * set(1,a): [a,c]->b
          * So UniqList contains [a,c] and b is returned
          */
-        final ArrayList<E> l = new ArrayList<E>();
-        final HashSet<E> s = new HashSet<E>();
-        final SetUniqueList<E> ul = new SetUniqueList<E>(l, s);
+        final ArrayList<E> l = new ArrayList<>();
+        final HashSet<E> s = new HashSet<>();
+        final SetUniqueList<E> ul = new SetUniqueList<>(l, s);
 
         final E a = (E) new String("A");
         final E b = (E) new String("B");
@@ -440,7 +439,7 @@
     }
 
     public void testCollections304() {
-        final List<String> list = new LinkedList<String>();
+        final List<String> list = new LinkedList<>();
         final SetUniqueList<String> decoratedList = SetUniqueList.setUniqueList(list);
         final String s1 = "Apple";
         final String s2 = "Lemon";
@@ -464,17 +463,17 @@
 
     public void testSubListIsUnmodifiable() {
         resetFull();
-        List<E> subList = getCollection().subList(1, 3);
+        final List<E> subList = getCollection().subList(1, 3);
         try {
             subList.remove(0);
             fail("subList should be unmodifiable");
-        } catch (UnsupportedOperationException e) {
+        } catch (final UnsupportedOperationException e) {
             // expected
         }
     }
     @SuppressWarnings("unchecked")
     public void testCollections307() {
-        List<E> list = new ArrayList<E>();
+        List<E> list = new ArrayList<>();
         List<E> uniqueList = SetUniqueList.setUniqueList(list);
 
         final String hello = "Hello";
@@ -488,14 +487,14 @@
         assertFalse(subList.contains(world)); // passes
         assertFalse(subUniqueList.contains(world)); // fails
 
-        List<E> worldList = new ArrayList<E>();
+        List<E> worldList = new ArrayList<>();
         worldList.add((E) world);
         assertFalse(subList.contains("World")); // passes
         assertFalse(subUniqueList.contains("World")); // fails
 
         // repeat the test with a different class than HashSet;
         // which means subclassing SetUniqueList below
-        list = new ArrayList<E>();
+        list = new ArrayList<>();
         uniqueList = new SetUniqueList307(list, new java.util.TreeSet<E>());
 
         uniqueList.add((E) hello);
@@ -507,7 +506,7 @@
         assertFalse(subList.contains(world)); // passes
         assertFalse(subUniqueList.contains(world)); // fails
 
-        worldList = new ArrayList<E>();
+        worldList = new ArrayList<>();
         worldList.add((E) world);
         assertFalse(subList.contains("World")); // passes
         assertFalse(subUniqueList.contains("World")); // fails
@@ -515,13 +514,13 @@
 
     @SuppressWarnings("unchecked")
     public void testRetainAll() {
-        final List<E> list = new ArrayList<E>(10);
+        final List<E> list = new ArrayList<>(10);
         final SetUniqueList<E> uniqueList = SetUniqueList.setUniqueList(list);
         for (int i = 0; i < 10; ++i) {
             uniqueList.add((E)Integer.valueOf(i));
         }
 
-        final Collection<E> retained = new ArrayList<E>(5);
+        final Collection<E> retained = new ArrayList<>(5);
         for (int i = 0; i < 5; ++i) {
             retained.add((E)Integer.valueOf(i * 2));
         }
@@ -538,7 +537,7 @@
     @SuppressWarnings("unchecked")
     public void testRetainAllWithInitialList() {
         // initialized with empty list
-        final List<E> list = new ArrayList<E>(10);
+        final List<E> list = new ArrayList<>(10);
         for (int i = 0; i < 5; ++i) {
             list.add((E)Integer.valueOf(i));
         }
@@ -547,7 +546,7 @@
             uniqueList.add((E)Integer.valueOf(i));
         }
 
-        final Collection<E> retained = new ArrayList<E>(5);
+        final Collection<E> retained = new ArrayList<>(5);
         for (int i = 0; i < 5; ++i) {
             retained.add((E)Integer.valueOf(i * 2));
         }
@@ -562,7 +561,7 @@
     }
 
     public void testSetCollections444() {
-        final SetUniqueList<Integer> lset = new SetUniqueList<Integer>(new ArrayList<Integer>(), new HashSet<Integer>());
+        final SetUniqueList<Integer> lset = new SetUniqueList<>(new ArrayList<Integer>(), new HashSet<Integer>());
 
         // Duplicate element
         final Integer obj1 = Integer.valueOf(1);
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/list/TransformedListTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/list/TransformedListTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/list/TransformedListTest.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/list/TransformedListTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -29,7 +29,6 @@
  * implementation.
  *
  * @since 3.0
- * @version $Id: TransformedListTest.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 public class TransformedListTest<E> extends AbstractListTest<E> {
 
@@ -39,12 +38,12 @@
 
     @Override
     public List<E> makeConfirmedCollection() {
-        return new ArrayList<E>();
+        return new ArrayList<>();
     }
 
     @Override
     public List<E> makeConfirmedFullCollection() {
-        final List<E> list = new ArrayList<E>();
+        final List<E> list = new ArrayList<>();
         list.addAll(Arrays.asList(getFullElements()));
         return list;
     }
@@ -58,7 +57,7 @@
     @Override
     @SuppressWarnings("unchecked")
     public List<E> makeFullCollection() {
-        final List<E> list = new ArrayList<E>();
+        final List<E> list = new ArrayList<>();
         list.addAll(Arrays.asList(getFullElements()));
         return TransformedList.transformingList(list, (Transformer<E, E>) TransformedCollectionTest.NOOP_TRANSFORMER);
     }
@@ -95,7 +94,7 @@
         it.add((E) "44");
         assertEquals(Integer.valueOf(44), list.get(1));
 
-        final List<E> adds = new ArrayList<E>();
+        final List<E> adds = new ArrayList<>();
         adds.add((E) "1");
         adds.add((E) "2");
         list.clear();
@@ -112,7 +111,7 @@
     }
 
     public void testTransformedList_decorateTransform() {
-        final List<Object> originalList = new ArrayList<Object>();
+        final List<Object> originalList = new ArrayList<>();
         final Object[] els = new Object[] {"1", "3", "5", "7", "2", "4", "6"};
         for (final Object el : els) {
             originalList.add(el);
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/list/TreeListTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/list/TreeListTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/list/TreeListTest.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/list/TreeListTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -28,7 +28,6 @@
  * JUnit tests
  *
  * @since 3.1
- * @version $Id: TreeListTest.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 public class TreeListTest<E> extends AbstractListTest<E> {
 
@@ -107,7 +106,7 @@
     //-----------------------------------------------------------------------
     @Override
     public TreeList<E> makeObject() {
-        return new TreeList<E>();
+        return new TreeList<>();
     }
 
     //-----------------------------------------------------------------------
@@ -220,7 +219,7 @@
     public void testBug35258() {
         final Object objectToRemove = Integer.valueOf(3);
 
-        final List<Integer> treelist = new TreeList<Integer>();
+        final List<Integer> treelist = new TreeList<>();
         treelist.add(Integer.valueOf(0));
         treelist.add(Integer.valueOf(1));
         treelist.add(Integer.valueOf(2));
@@ -248,7 +247,7 @@
     }
 
     public void testBugCollections447() {
-        final List<String> treeList = new TreeList<String>();
+        final List<String> treeList = new TreeList<>();
         treeList.add("A");
         treeList.add("B");
         treeList.add("C");
@@ -274,20 +273,20 @@
         // when initializing the TreeList with another collection
 
         for (int size = 1; size < 1000; size++) {
-            List<Integer> other = new ArrayList<Integer>(size);
+            final List<Integer> other = new ArrayList<>(size);
             for (int i = 0; i < size; i++) {
                 other.add(i);
             }
-            TreeList<Integer> l = new TreeList<Integer>(other);
-            ListIterator<Integer> it = l.listIterator();
+            final TreeList<Integer> l = new TreeList<>(other);
+            final ListIterator<Integer> it = l.listIterator();
             int i = 0;
             while (it.hasNext()) {
-                Integer val = it.next();
+                final Integer val = it.next();
                 assertEquals(i++, val.intValue());
             }
 
             while (it.hasPrevious()) {
-                Integer val = it.previous();
+                final Integer val = it.previous();
                 assertEquals(--i, val.intValue());
             }
         }
@@ -302,28 +301,28 @@
         // to simulate different cases in addAll, do different runs where
         // the number of elements already in the list and being added by addAll differ
 
-        int size = 1000;
+        final int size = 1000;
         for (int i = 0; i < 100; i++) {
-            List<Integer> other = new ArrayList<Integer>(size);
+            final List<Integer> other = new ArrayList<>(size);
             for (int j = i; j < size; j++) {
                 other.add(j);
             }
-            TreeList<Integer> l = new TreeList<Integer>();
+            final TreeList<Integer> l = new TreeList<>();
             for (int j = 0; j < i; j++) {
                 l.add(j);
             }
 
             l.addAll(other);
 
-            ListIterator<Integer> it = l.listIterator();
+            final ListIterator<Integer> it = l.listIterator();
             int cnt = 0;
             while (it.hasNext()) {
-                Integer val = it.next();
+                final Integer val = it.next();
                 assertEquals(cnt++, val.intValue());
             }
 
             while (it.hasPrevious()) {
-                Integer val = it.previous();
+                final Integer val = it.previous();
                 assertEquals(--cnt, val.intValue());
             }
         }
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/list/UnmodifiableListTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/list/UnmodifiableListTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/list/UnmodifiableListTest.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/list/UnmodifiableListTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -26,7 +26,6 @@
  * {@link UnmodifiableList} implementation.
  *
  * @since 3.0
- * @version $Id: UnmodifiableListTest.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class UnmodifiableListTest<E> extends AbstractListTest<E> {
 
@@ -37,14 +36,14 @@
     //-----------------------------------------------------------------------
     @Override
     public UnmodifiableList<E> makeObject() {
-        return new UnmodifiableList<E>(new ArrayList<E>());
+        return new UnmodifiableList<>(new ArrayList<E>());
     }
 
     @Override
     public UnmodifiableList<E> makeFullCollection() {
-        final ArrayList<E> list = new ArrayList<E>();
+        final ArrayList<E> list = new ArrayList<>();
         list.addAll(Arrays.asList(getFullElements()));
-        return new UnmodifiableList<E>(list);
+        return new UnmodifiableList<>(list);
     }
 
     @Override
@@ -69,7 +68,7 @@
     @SuppressWarnings("unchecked")
     protected void setupList() {
         list = makeFullCollection();
-        array = new ArrayList<E>();
+        array = new ArrayList<>();
         array.add((E) Integer.valueOf(1));
     }
 
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/ListUtilsTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/ListUtilsTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/ListUtilsTest.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/ListUtilsTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -33,7 +33,6 @@
 /**
  * Tests for ListUtils.
  *
- * @version $Id: ListUtilsTest.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class ListUtilsTest {
 
@@ -50,7 +49,7 @@
     @Before
     public void setUp() {
         fullArray = new String[]{a, b, c, d, e};
-        fullList = new ArrayList<String>(Arrays.asList(fullArray));
+        fullList = new ArrayList<>(Arrays.asList(fullArray));
     }
 
     /**
@@ -77,7 +76,7 @@
     @Test
     public void testIntersectNonEmptySubset() {
         // create a copy
-        final List<String> other = new ArrayList<String>(fullList);
+        final List<String> other = new ArrayList<>(fullList);
 
         // remove a few items
         assertNotNull(other.remove(0));
@@ -110,8 +109,8 @@
      */
     @Test
     public void testIntersectionOrderInsensitivity() {
-        final List<String> one = new ArrayList<String>();
-        final List<String> two = new ArrayList<String>();
+        final List<String> one = new ArrayList<>();
+        final List<String> two = new ArrayList<>();
         one.add("a");
         one.add("b");
         two.add("a");
@@ -124,14 +123,15 @@
     @Test
     public void testPredicatedList() {
         final Predicate<Object> predicate = new Predicate<Object>() {
+            @Override
             public boolean evaluate(final Object o) {
                 return o instanceof String;
             }
         };
-        List<Object> list = ListUtils.predicatedList(new ArrayList<Object>(), predicate);
+        final List<Object> list = ListUtils.predicatedList(new ArrayList<>(), predicate);
         assertTrue("returned object should be a PredicatedList", list instanceof PredicatedList);
         try {
-            ListUtils.predicatedList(new ArrayList<Object>(), null);
+            ListUtils.predicatedList(new ArrayList<>(), null);
             fail("Expecting IllegalArgumentException for null predicate.");
         } catch (final NullPointerException ex) {
             // expected
@@ -150,6 +150,7 @@
 
             private int index;
 
+            @Override
             public Integer create() {
                 index++;
                 return Integer.valueOf(index);
@@ -167,7 +168,7 @@
     public void testEmptyIfNull() {
         assertTrue(ListUtils.emptyIfNull(null).isEmpty());
 
-        final List<Long> list = new ArrayList<Long>();
+        final List<Long> list = new ArrayList<>();
         assertSame(list, ListUtils.emptyIfNull(list));
     }
 
@@ -175,7 +176,7 @@
     public void testDefaultIfNull() {
         assertTrue(ListUtils.defaultIfNull(null, Collections.emptyList()).isEmpty());
 
-        final List<Long> list = new ArrayList<Long>();
+        final List<Long> list = new ArrayList<>();
         assertSame(list, ListUtils.defaultIfNull(list, Collections.<Long>emptyList()));
     }
 
@@ -183,8 +184,8 @@
     public void testEquals() {
         final Collection<String> data = Arrays.asList("a", "b", "c");
 
-        final List<String> a = new ArrayList<String>( data );
-        final List<String> b = new ArrayList<String>( data );
+        final List<String> a = new ArrayList<>( data );
+        final List<String> b = new ArrayList<>( data );
 
         assertEquals(true, a.equals(b));
         assertEquals(true, ListUtils.isEqualList(a, b));
@@ -199,8 +200,8 @@
     public void testHashCode() {
         final Collection<String> data = Arrays.asList("a", "b", "c");
 
-        final List<String> a = new ArrayList<String>(data);
-        final List<String> b = new ArrayList<String>(data);
+        final List<String> a = new ArrayList<>(data);
+        final List<String> b = new ArrayList<>(data);
 
         assertEquals(true, a.hashCode() == b.hashCode());
         assertEquals(true, a.hashCode() == ListUtils.hashCodeForList(a));
@@ -213,7 +214,7 @@
 
     @Test
     public void testRetainAll() {
-        final List<String> sub = new ArrayList<String>();
+        final List<String> sub = new ArrayList<>();
         sub.add(a);
         sub.add(b);
         sub.add(x);
@@ -233,7 +234,7 @@
 
     @Test
     public void testRemoveAll() {
-        final List<String> sub = new ArrayList<String>();
+        final List<String> sub = new ArrayList<>();
         sub.add(a);
         sub.add(b);
         sub.add(x);
@@ -251,19 +252,19 @@
 
     @Test
     public void testSubtract() {
-        final List<String> list = new ArrayList<String>();
+        final List<String> list = new ArrayList<>();
         list.add(a);
         list.add(b);
         list.add(a);
         list.add(x);
 
-        final List<String> sub = new ArrayList<String>();
+        final List<String> sub = new ArrayList<>();
         sub.add(a);
 
         final List<String> result = ListUtils.subtract(list, sub);
         assertTrue(result.size() == 3);
 
-        final List<String> expected = new ArrayList<String>();
+        final List<String> expected = new ArrayList<>();
         expected.add(b);
         expected.add(a);
         expected.add(x);
@@ -278,19 +279,19 @@
 
     @Test
     public void testSubtractNullElement() {
-        final List<String> list = new ArrayList<String>();
+        final List<String> list = new ArrayList<>();
         list.add(a);
         list.add(null);
         list.add(null);
         list.add(x);
 
-        final List<String> sub = new ArrayList<String>();
+        final List<String> sub = new ArrayList<>();
         sub.add(null);
 
         final List<String> result = ListUtils.subtract(list, sub);
         assertTrue(result.size() == 3);
 
-        final List<String> expected = new ArrayList<String>();
+        final List<String> expected = new ArrayList<>();
         expected.add(a);
         expected.add(null);
         expected.add(x);
@@ -338,20 +339,20 @@
         List<Character> lcs = ListUtils.longestCommonSubsequence(Collections.EMPTY_LIST, Collections.EMPTY_LIST);
         assertEquals(0, lcs.size());
 
-        List<Character> list1 = Arrays.asList('B', 'A', 'N', 'A', 'N', 'A');
-        List<Character> list2 = Arrays.asList('A', 'N', 'A', 'N', 'A', 'S');
+        final List<Character> list1 = Arrays.asList('B', 'A', 'N', 'A', 'N', 'A');
+        final List<Character> list2 = Arrays.asList('A', 'N', 'A', 'N', 'A', 'S');
         lcs = ListUtils.longestCommonSubsequence(list1, list2);
 
         List<Character> expected = Arrays.asList('A', 'N', 'A', 'N', 'A');
         assertEquals(expected, lcs);
 
-        List<Character> list3 = Arrays.asList('A', 'T', 'A', 'N', 'A');
+        final List<Character> list3 = Arrays.asList('A', 'T', 'A', 'N', 'A');
         lcs = ListUtils.longestCommonSubsequence(list1, list3);
 
         expected = Arrays.asList('A', 'A', 'N', 'A');
         assertEquals(expected, lcs);
 
-        List<Character> listZorro = Arrays.asList('Z', 'O', 'R', 'R', 'O');
+        final List<Character> listZorro = Arrays.asList('Z', 'O', 'R', 'R', 'O');
         lcs = ListUtils.longestCommonSubsequence(list1, listZorro);
 
         assertTrue(lcs.isEmpty());
@@ -378,18 +379,18 @@
       String lcs = ListUtils.longestCommonSubsequence("", "");
       assertEquals(0, lcs.length());
 
-      String banana = "BANANA";
-      String ananas = "ANANAS";
+      final String banana = "BANANA";
+      final String ananas = "ANANAS";
       lcs = ListUtils.longestCommonSubsequence(banana, ananas);
 
       assertEquals("ANANA", lcs);
 
-      String atana = "ATANA";
+      final String atana = "ATANA";
       lcs = ListUtils.longestCommonSubsequence(banana, atana);
 
       assertEquals("AANA", lcs);
 
-      String zorro = "ZORRO";
+      final String zorro = "ZORRO";
       lcs = ListUtils.longestCommonSubsequence(banana, zorro);
 
       assertEquals(0, lcs.length());
@@ -398,7 +399,7 @@
     @Test
     @SuppressWarnings("boxing") // OK in test code
     public void testPartition() {
-        final List<Integer> strings = new ArrayList<Integer>();
+        final List<Integer> strings = new ArrayList<>();
         for (int i = 0; i <= 6; i++) {
             strings.add(i);
         }
@@ -424,9 +425,14 @@
             fail("failed to check for size argument");
         } catch (final IllegalArgumentException e) {}
 
+        final List<List<Integer>> partitionMax = ListUtils.partition(strings, Integer.MAX_VALUE);
+        assertEquals(1, partitionMax.size());
+        assertEquals(strings.size(), partitionMax.get(0).size());
+        assertEquals(strings, partitionMax.get(0));
     }
 
     private static Predicate<Number> EQUALS_TWO = new Predicate<Number>() {
+        @Override
         public boolean evaluate(final Number input) {
             return input.intValue() == 2;
         }
@@ -435,7 +441,7 @@
     @Test
     @SuppressWarnings("boxing") // OK in test code
     public void testSelect() {
-        final List<Integer> list = new ArrayList<Integer>();
+        final List<Integer> list = new ArrayList<>();
         list.add(1);
         list.add(2);
         list.add(3);
@@ -453,7 +459,7 @@
     @Test
     @SuppressWarnings("boxing") // OK in test code
     public void testSelectRejected() {
-        final List<Long> list = new ArrayList<Long>();
+        final List<Long> list = new ArrayList<>();
         list.add(1L);
         list.add(2L);
         list.add(3L);
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/AbstractIterableMapTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/AbstractIterableMapTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/AbstractIterableMapTest.java	2013-11-11 21:58:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/AbstractIterableMapTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -28,7 +28,6 @@
 /**
  * Abstract test class for {@link IterableMap} methods and contracts.
  *
- * @version $Id: AbstractIterableMapTest.java 1540860 2013-11-11 21:58:27Z ebourg $
  */
 public abstract class AbstractIterableMapTest<K, V> extends AbstractMapTest<K, V> {
 
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/AbstractMapTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/AbstractMapTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/AbstractMapTest.java	2015-11-22 21:11:49.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/AbstractMapTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -119,7 +119,6 @@
  * cases.  For example, if your map does not allow duplicate values, override
  * {@link #isAllowDuplicateValues()} and have it return <code>false</code>
  *
- * @version $Id: AbstractMapTest.java 1715695 2015-11-22 21:11:49Z tn $
  */
 public abstract class AbstractMapTest<K, V> extends AbstractObjectTest {
 
@@ -322,7 +321,7 @@
 
     @SuppressWarnings("unchecked")
     protected <E> List<E> getAsList(final Object[] o) {
-        final ArrayList<E> result = new ArrayList<E>();
+        final ArrayList<E> result = new ArrayList<>();
         for (final Object element : o) {
             result.add((E) element);
         }
@@ -451,14 +450,14 @@
      * @return a map that is known to be valid
      */
     public Map<K, V> makeConfirmedMap() {
-        return new HashMap<K, V>();
+        return new HashMap<>();
     }
 
     /**
      * Creates a new Map Entry that is independent of the first and the map.
      */
     public static <K, V> Map.Entry<K, V> cloneMapEntry(final Map.Entry<K, V> entry) {
-        final HashMap<K, V> map = new HashMap<K, V>();
+        final HashMap<K, V> map = new HashMap<>();
         map.put(entry.getKey(), entry.getValue());
         return map.entrySet().iterator().next();
     }
@@ -625,14 +624,14 @@
         final Object[] keys = getSampleKeys();
 
         resetEmpty();
-        for (Object key : keys) {
+        for (final Object key : keys) {
             assertTrue("Map must not contain key when map is empty",
                     !getMap().containsKey(key));
         }
         verify();
 
         resetFull();
-        for (Object key : keys) {
+        for (final Object key : keys) {
             assertTrue("Map must contain key for a mapping in the map. " +
                        "Missing: " + key, getMap().containsKey(key));
         }
@@ -648,9 +647,9 @@
         final Object[] values = getSampleValues();
 
         resetEmpty();
-        for(int i = 0; i < values.length; i++) {
+        for (final Object value : values) {
             assertTrue("Empty map must not contain value",
-                       !getMap().containsValue(values[i]));
+                       !getMap().containsValue(value));
         }
         verify();
 
@@ -728,7 +727,7 @@
     /**
      * Tests Map.toString().  Since the format of the string returned by the
      * toString() method is not defined in the Map interface, there is no
-     * common way to test the results of the toString() method.  Thereforce,
+     * common way to test the results of the toString() method.  Therefore,
      * it is encouraged that Map implementations override this test with one
      * that checks the format matches any format defined in its API.  This
      * default implementation just verifies that the toString() method does
@@ -1128,7 +1127,7 @@
         resetFull();
         final Set<Map.Entry<K, V>> entrySet = getMap().entrySet();
         final Map.Entry<K, V> entry = entrySet.iterator().next();
-        final HashMap<K, V> temp = new HashMap<K, V>();
+        final HashMap<K, V> temp = new HashMap<>();
         temp.put(entry.getKey(), (V) "A VERY DIFFERENT VALUE");
         final Map.Entry<K, V> test = temp.entrySet().iterator().next();
         assertEquals(false, entrySet.contains(test));
@@ -1175,7 +1174,7 @@
         final Set<Map.Entry<K, V>> entrySet = getMap().entrySet();
         final Map.Entry<K, V> entry = entrySet.iterator().next();
         final K key = entry.getKey();
-        final HashMap<K, V> temp = new HashMap<K, V>();
+        final HashMap<K, V> temp = new HashMap<>();
         temp.put(entry.getKey(), (V) "A VERY DIFFERENT VALUE");
         final Map.Entry<K, V> test = temp.entrySet().iterator().next();
 
@@ -1204,12 +1203,12 @@
         resetFull();
         final V[] sampleValues = getSampleValues();
         final Collection<V> values = getMap().values();
-        for (int i = 0; i < sampleValues.length; i++) {
-            if (map.containsValue(sampleValues[i])) {
+        for (final V sampleValue : sampleValues) {
+            if (map.containsValue(sampleValue)) {
                 int j = 0;  // loop counter prevents infinite loops when remove is broken
-                while (values.contains(sampleValues[i]) && j < 10000) {
+                while (values.contains(sampleValue) && j < 10000) {
                     try {
-                        values.remove(sampleValues[i]);
+                        values.remove(sampleValue);
                     } catch (final UnsupportedOperationException e) {
                         // if values.remove is unsupported, just skip this test
                         return;
@@ -1219,7 +1218,7 @@
                 assertTrue("values().remove(obj) is broken", j < 10000);
                 assertTrue(
                     "Value should have been removed from the underlying map.",
-                    !getMap().containsValue(sampleValues[i]));
+                    !getMap().containsValue(sampleValue));
             }
         }
     }
@@ -1316,16 +1315,16 @@
         resetFull();
         final K[] sampleKeys = getSampleKeys();
         final Set<K> keys = getMap().keySet();
-        for (int i = 0; i < sampleKeys.length; i++) {
+        for (final K sampleKey : sampleKeys) {
             try {
-                keys.remove(sampleKeys[i]);
+                keys.remove(sampleKey);
             } catch (final UnsupportedOperationException e) {
                 // if key.remove is unsupported, just skip this test
                 return;
             }
             assertTrue(
                 "Key should have been removed from the underlying map.",
-                !getMap().containsKey(sampleKeys[i]));
+                !getMap().containsKey(sampleKey));
         }
     }
 
@@ -1405,7 +1404,7 @@
         final Set<Map.Entry<K, V>> entrySet = getMap().entrySet();
         for (int i = 0; i < sampleKeys.length; i++) {
             try {
-                entrySet.remove(new DefaultMapEntry<K, V>(sampleKeys[i], sampleValues[i]));
+                entrySet.remove(new DefaultMapEntry<>(sampleKeys[i], sampleValues[i]));
             } catch (final UnsupportedOperationException e) {
                 // if entrySet removal is unsupported, just skip this test
                 return;
@@ -1436,7 +1435,7 @@
             return;
         }
         final Set<Map.Entry<K, V>> entrySet = getMap().entrySet();
-        final HashSet<Map.Entry<K, V>> comparisonSet = new HashSet<Map.Entry<K, V>>(entrySet);
+        final HashSet<Map.Entry<K, V>> comparisonSet = new HashSet<>(entrySet);
         try {
             assertFalse(entrySet.removeAll(Collections.<Map.Entry<K, V>> emptySet()));
         } catch (final UnsupportedOperationException e) {
@@ -1471,7 +1470,7 @@
             return;
         }
         final Set<Map.Entry<K, V>> entrySet = getMap().entrySet();
-        final HashSet<Map.Entry<K, V>> comparisonSet = new HashSet<Map.Entry<K, V>>(entrySet);
+        final HashSet<Map.Entry<K, V>> comparisonSet = new HashSet<>(entrySet);
         try {
             assertFalse(entrySet.retainAll(comparisonSet));
         } catch (final UnsupportedOperationException e) {
@@ -1957,19 +1956,13 @@
         assertEquals("Map should be same size as HashMap", size, getMap().size());
         assertEquals("Map should be empty if HashMap is", empty, getMap().isEmpty());
         assertEquals("hashCodes should be the same", getConfirmed().hashCode(), getMap().hashCode());
-        // this fails for LRUMap because confirmed.equals() somehow modifies
-        // map, causing concurrent modification exceptions.
-        // assertEquals("Map should still equal HashMap", confirmed, map);
-        // this works though and performs the same verification:
+        // changing the order of the assertion below fails for LRUMap because confirmed is
+        // another collection (e.g. treemap) and confirmed.equals() creates a normal iterator (not
+        // #mapIterator()), which modifies the parent expected modCount of the map object, causing
+        // concurrent modification exceptions.
+        // Because of this we have assertEquals(map, confirmed), and not the other way around.
+        assertEquals("Map should still equal HashMap", map, confirmed);
         assertTrue("Map should still equal HashMap", getMap().equals(getConfirmed()));
-        // TODO: this should really be reexamined to figure out why LRU map
-        // behaves like it does (the equals shouldn't modify since all accesses
-        // by the confirmed collection should be through an iterator, thus not
-        // causing LRUMap to change).
-        // When comparing two maps, the entries in the map have to be accessed
-        // (usually with the get(Object) method). In the case of the LRUMap, this
-        // also alters the modCount as moveToMRU is called for the retrieved entry.
-        // Imho, the modCount should not be increased for a read-only operation.
     }
 
     public void verifyEntrySet() {
@@ -2011,7 +2004,7 @@
     }
 
     public void verifyValues() {
-        final List<V> known = new ArrayList<V>(getConfirmed().values());
+        final List<V> known = new ArrayList<>(getConfirmed().values());
 
         // bug in IBM JDK: IBM J9 VM build 2.4, JRE 1.6.0 IBM J9 2.4 Linux x86-32 jvmxi3260sr12-20121024_126067
         // a call to values() on an empty map retrieved via TreeMap#headMap or tailMap
@@ -2019,7 +2012,7 @@
         // it will also not recover, as the value view is cached internally
         values = getMap().values();
 
-        final List<V> test = new ArrayList<V>(values);
+        final List<V> test = new ArrayList<>(values);
 
         final int size = getConfirmed().size();
         final boolean empty = getConfirmed().isEmpty();
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/AbstractOrderedMapTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/AbstractOrderedMapTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/AbstractOrderedMapTest.java	2013-11-11 21:58:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/AbstractOrderedMapTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -34,7 +34,6 @@
 /**
  * Abstract test class for {@link OrderedMap} methods and contracts.
  *
- * @version $Id: AbstractOrderedMapTest.java 1540860 2013-11-11 21:58:27Z ebourg $
  */
 public abstract class AbstractOrderedMapTest<K, V> extends AbstractIterableMapTest<K, V> {
 
@@ -69,7 +68,7 @@
      */
     @Override
     public Map<K, V> makeConfirmedMap() {
-        return new TreeMap<K, V>(new NullComparator<K>());
+        return new TreeMap<>(new NullComparator<K>());
     }
 
     /**
@@ -79,7 +78,7 @@
     @Override
     @SuppressWarnings("unchecked")
     public K[] getSampleKeys() {
-        final List<K> list = new ArrayList<K>(Arrays.asList(super.getSampleKeys()));
+        final List<K> list = new ArrayList<>(Arrays.asList(super.getSampleKeys()));
         Collections.sort(list, new NullComparator<K>());
         return (K[]) list.toArray();
     }
@@ -164,7 +163,7 @@
 
         resetFull();
         ordered = getMap();
-        final List<K> list = new ArrayList<K>(confirmed.keySet());
+        final List<K> list = new ArrayList<>(confirmed.keySet());
         Collections.reverse(list);
         final Iterator<K> it = list.iterator();
         K confirmedLast = it.next();
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/AbstractSortedMapTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/AbstractSortedMapTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/AbstractSortedMapTest.java	2013-11-11 21:58:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/AbstractSortedMapTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -29,7 +29,6 @@
 /**
  * Abstract test class for {@link java.util.SortedMap} methods and contracts.
  *
- * @version $Id: AbstractSortedMapTest.java 1540860 2013-11-11 21:58:27Z ebourg $
  */
 public abstract class AbstractSortedMapTest<K, V> extends AbstractMapTest<K, V> {
 
@@ -60,7 +59,7 @@
      */
     @Override
     public SortedMap<K, V> makeConfirmedMap() {
-        return new TreeMap<K, V>();
+        return new TreeMap<>();
     }
 
     //-----------------------------------------------------------------------
@@ -91,7 +90,7 @@
     public void testLastKey() {
         final SortedMap<K, V> sm = makeFullMap();
         K obj = null;
-        for (K k : sm.keySet()) {
+        for (final K k : sm.keySet()) {
             obj = k;
         }
         assertSame(obj, sm.lastKey());
@@ -99,22 +98,22 @@
 
     //-----------------------------------------------------------------------
     public BulkTest bulkTestHeadMap() {
-        return new TestHeadMap<K, V>(this);
+        return new TestHeadMap<>(this);
     }
 
     public BulkTest bulkTestTailMap() {
-        return new TestTailMap<K, V>(this);
+        return new TestTailMap<>(this);
     }
 
     public BulkTest bulkTestSubMap() {
-        return new TestSubMap<K, V>(this);
+        return new TestSubMap<>(this);
     }
 
     public static abstract class TestViewMap <K, V> extends AbstractSortedMapTest<K, V> {
         protected final AbstractMapTest<K, V> main;
-        protected final List<K> subSortedKeys = new ArrayList<K>();
-        protected final List<V> subSortedValues = new ArrayList<V>();
-        protected final List<V> subSortedNewValues = new ArrayList<V>();
+        protected final List<K> subSortedKeys = new ArrayList<>();
+        protected final List<V> subSortedValues = new ArrayList<>();
+        protected final List<V> subSortedNewValues = new ArrayList<>();
 
         public TestViewMap(final String name, final AbstractMapTest<K, V> main) {
             super(name);
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/CaseInsensitiveMapTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/CaseInsensitiveMapTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/CaseInsensitiveMapTest.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/CaseInsensitiveMapTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -28,7 +28,6 @@
 /**
  * Tests for the {@link CaseInsensitiveMap} implementation.
  *
- * @version $Id: CaseInsensitiveMapTest.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 public class CaseInsensitiveMapTest<K, V> extends AbstractIterableMapTest<K, V> {
 
@@ -42,7 +41,7 @@
 
     @Override
     public CaseInsensitiveMap<K, V> makeObject() {
-        return new CaseInsensitiveMap<K, V>();
+        return new CaseInsensitiveMap<>();
     }
 
     @Override
@@ -80,13 +79,13 @@
     }
 
     public void testPutAll() {
-        final Map<Object, String> map = new HashMap<Object, String>();
+        final Map<Object, String> map = new HashMap<>();
         map.put("One", "One");
         map.put("Two", "Two");
         map.put("one", "Three");
         map.put(null, "Four");
         map.put(Integer.valueOf(20), "Five");
-        final Map<Object, String> caseInsensitiveMap = new CaseInsensitiveMap<Object, String>(map);
+        final Map<Object, String> caseInsensitiveMap = new CaseInsensitiveMap<>(map);
         assertEquals(4, caseInsensitiveMap.size()); // ones collapsed
         final Set<Object> keys = caseInsensitiveMap.keySet();
         assertTrue(keys.contains("one"));
@@ -101,7 +100,7 @@
 
     @SuppressWarnings("unchecked")
     public void testClone() {
-        final CaseInsensitiveMap<K, V> map = new CaseInsensitiveMap<K, V>(10);
+        final CaseInsensitiveMap<K, V> map = new CaseInsensitiveMap<>(10);
         map.put((K) "1", (V) "1");
         final CaseInsensitiveMap<K, V> cloned = map.clone();
         assertEquals(map.size(), cloned.size());
@@ -121,7 +120,7 @@
 
         final Locale[] locales = { Locale.ENGLISH, new Locale("tr", "", ""), Locale.getDefault() };
 
-        final String[][] data = { 
+        final String[][] data = {
             { "i", "I" },
             { "\u03C2", "\u03C3" },
             { "\u03A3", "\u03C2" },
@@ -133,7 +132,7 @@
                 Locale.setDefault(locale);
                 for (int j = 0; j < data.length; j++) {
                     assertTrue("Test data corrupt: " + j, data[j][0].equalsIgnoreCase(data[j][1]));
-                    final CaseInsensitiveMap<String, String> map = new CaseInsensitiveMap<String, String>();
+                    final CaseInsensitiveMap<String, String> map = new CaseInsensitiveMap<>();
                     map.put(data[j][0], "value");
                     assertEquals(Locale.getDefault() + ": " + j, "value", map.get(data[j][1]));
                 }
@@ -147,7 +146,7 @@
      * Test for <a href="https://issues.apache.org/jira/browse/COLLECTIONS-323">COLLECTIONS-323</a>.
      */
     public void testInitialCapacityZero() {
-        final CaseInsensitiveMap<String,String> map = new CaseInsensitiveMap<String,String>(0);
+        final CaseInsensitiveMap<String,String> map = new CaseInsensitiveMap<>(0);
         assertEquals(1, map.data.length);
     }
 }
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/CompositeMapTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/CompositeMapTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/CompositeMapTest.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/CompositeMapTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -25,7 +25,6 @@
  * {@link CompositeMap} implementation.
  *
  * @since 3.0
- * @version $Id: CompositeMapTest.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 public class CompositeMapTest<K, V> extends AbstractIterableMapTest<K, V> {
     /** used as a flag in MapMutator tests */
@@ -43,7 +42,7 @@
 
     @Override
     public CompositeMap<K, V> makeObject() {
-        final CompositeMap<K, V> map = new CompositeMap<K, V>();
+        final CompositeMap<K, V> map = new CompositeMap<>();
         map.addComposited(new HashMap<K, V>());
         map.setMutator( new EmptyMapMutator<K, V>() );
         return map;
@@ -51,7 +50,7 @@
 
     @SuppressWarnings("unchecked")
     private Map<K, V> buildOne() {
-        final HashMap<K, V> map = new HashMap<K, V>();
+        final HashMap<K, V> map = new HashMap<>();
         map.put((K) "1", (V) "one");
         map.put((K) "2", (V) "two");
         return map;
@@ -59,22 +58,22 @@
 
     @SuppressWarnings("unchecked")
     public Map<K, V> buildTwo() {
-        final HashMap<K, V> map = new HashMap<K, V>();
+        final HashMap<K, V> map = new HashMap<>();
         map.put((K) "3", (V) "three");
         map.put((K) "4", (V) "four");
         return map;
     }
 
     public void testGet() {
-        final CompositeMap<K, V> map = new CompositeMap<K, V>(buildOne(), buildTwo());
+        final CompositeMap<K, V> map = new CompositeMap<>(buildOne(), buildTwo());
         assertEquals("one", map.get("1"));
         assertEquals("four", map.get("4"));
     }
 
     @SuppressWarnings("unchecked")
     public void testAddComposited() {
-        final CompositeMap<K, V> map = new CompositeMap<K, V>(buildOne(), buildTwo());
-        final HashMap<K, V> three = new HashMap<K, V>();
+        final CompositeMap<K, V> map = new CompositeMap<>(buildOne(), buildTwo());
+        final HashMap<K, V> three = new HashMap<>();
         three.put((K) "5", (V) "five");
         map.addComposited(three);
         assertTrue(map.containsKey("5"));
@@ -88,8 +87,8 @@
 
     @SuppressWarnings("unchecked")
     public void testRemoveComposited() {
-        final CompositeMap<K, V> map = new CompositeMap<K, V>(buildOne(), buildTwo());
-        final HashMap<K, V> three = new HashMap<K, V>();
+        final CompositeMap<K, V> map = new CompositeMap<>(buildOne(), buildTwo());
+        final HashMap<K, V> three = new HashMap<>();
         three.put((K) "5", (V) "five");
         map.addComposited(three);
         assertTrue(map.containsKey("5"));
@@ -104,8 +103,8 @@
 
     @SuppressWarnings("unchecked")
     public void testRemoveFromUnderlying() {
-        final CompositeMap<K, V> map = new CompositeMap<K, V>(buildOne(), buildTwo());
-        final HashMap<K, V> three = new HashMap<K, V>();
+        final CompositeMap<K, V> map = new CompositeMap<>(buildOne(), buildTwo());
+        final HashMap<K, V> three = new HashMap<>();
         three.put((K) "5", (V) "five");
         map.addComposited(three);
         assertTrue(map.containsKey("5"));
@@ -117,8 +116,8 @@
 
     @SuppressWarnings("unchecked")
     public void testRemoveFromComposited() {
-        final CompositeMap<K, V> map = new CompositeMap<K, V>(buildOne(), buildTwo());
-        final HashMap<K, V> three = new HashMap<K, V>();
+        final CompositeMap<K, V> map = new CompositeMap<>(buildOne(), buildTwo());
+        final HashMap<K, V> three = new HashMap<>();
         three.put((K) "5", (V) "five");
         map.addComposited(three);
         assertTrue(map.containsKey("5"));
@@ -129,10 +128,11 @@
     }
 
     public void testResolveCollision() {
-        final CompositeMap<K, V> map = new CompositeMap<K, V>(buildOne(), buildTwo(),
+        final CompositeMap<K, V> map = new CompositeMap<>(buildOne(), buildTwo(),
             new CompositeMap.MapMutator<K, V>() {
             private static final long serialVersionUID = 1L;
 
+            @Override
             public void resolveCollision(final CompositeMap<K, V> composite,
             final Map<K, V> existing,
             final Map<K, V> added,
@@ -140,11 +140,13 @@
                 pass = true;
             }
 
+            @Override
             public V put(final CompositeMap<K, V> map, final Map<K, V>[] composited, final K key,
                 final V value) {
                 throw new UnsupportedOperationException();
             }
 
+            @Override
             public void putAll(final CompositeMap<K, V> map, final Map<K, V>[] composited, final Map<? extends K, ? extends V> t) {
                 throw new UnsupportedOperationException();
             }
@@ -156,9 +158,10 @@
 
     @SuppressWarnings("unchecked")
     public void testPut() {
-        final CompositeMap<K, V> map = new CompositeMap<K, V>(buildOne(), buildTwo(),
+        final CompositeMap<K, V> map = new CompositeMap<>(buildOne(), buildTwo(),
             new CompositeMap.MapMutator<K, V>() {
             private static final long serialVersionUID = 1L;
+            @Override
             public void resolveCollision(final CompositeMap<K, V> composite,
             final Map<K, V> existing,
             final Map<K, V> added,
@@ -166,12 +169,14 @@
                 throw new UnsupportedOperationException();
             }
 
+            @Override
             public V put(final CompositeMap<K, V> map, final Map<K, V>[] composited, final K key,
                 final V value) {
                 pass = true;
                 return (V) "foo";
             }
 
+            @Override
             public void putAll(final CompositeMap<K, V> map, final Map<K, V>[] composited, final Map<? extends K, ? extends V> t) {
                 throw new UnsupportedOperationException();
             }
@@ -182,9 +187,10 @@
     }
 
     public void testPutAll() {
-        final CompositeMap<K, V> map = new CompositeMap<K, V>(buildOne(), buildTwo(),
+        final CompositeMap<K, V> map = new CompositeMap<>(buildOne(), buildTwo(),
             new CompositeMap.MapMutator<K, V>() {
             private static final long serialVersionUID = 1L;
+            @Override
             public void resolveCollision(final CompositeMap<K, V> composite,
             final Map<K, V> existing,
             final Map<K, V> added,
@@ -192,11 +198,13 @@
                 throw new UnsupportedOperationException();
             }
 
+            @Override
             public V put(final CompositeMap<K, V> map, final Map<K, V>[] composited, final K key,
                 final V value) {
                 throw new UnsupportedOperationException();
             }
 
+            @Override
             public void putAll(final CompositeMap<K, V> map, final Map<K, V>[] composited, final Map<? extends K, ? extends V> t) {
                 pass = true;
             }
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/DefaultedMapTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/DefaultedMapTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/DefaultedMapTest.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/DefaultedMapTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -26,11 +26,10 @@
 import org.apache.commons.collections4.functors.ConstantFactory;
 
 /**
- * Extension of {@link AbstractMapTest} for exercising the 
+ * Extension of {@link AbstractMapTest} for exercising the
  * {@link DefaultedMap} implementation.
  *
  * @since 3.2
- * @version $Id: DefaultedMapTest.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 public class DefaultedMapTest<K, V> extends AbstractIterableMapTest<K, V> {
 
@@ -50,7 +49,7 @@
     @Override
     @SuppressWarnings("unchecked")
     public void testMapGet() {
-        final Map<K, V> map = new DefaultedMap<K, V>((V) "NULL");
+        final Map<K, V> map = new DefaultedMap<>((V) "NULL");
 
         assertEquals(0, map.size());
         assertEquals(false, map.containsKey("NotInMap"));
@@ -66,7 +65,7 @@
 
     @SuppressWarnings("unchecked")
     public void testMapGet2() {
-        final HashMap<K, V> base = new HashMap<K, V>();
+        final HashMap<K, V> base = new HashMap<>();
         final Map<K, V> map = DefaultedMap.defaultedMap(base, (V) "NULL");
 
         assertEquals(0, map.size());
@@ -85,7 +84,7 @@
 
     @SuppressWarnings("unchecked")
     public void testMapGet3() {
-        final HashMap<K, V> base = new HashMap<K, V>();
+        final HashMap<K, V> base = new HashMap<>();
         final Map<K, V> map = DefaultedMap.defaultedMap(base, ConstantFactory.constantFactory((V) "NULL"));
 
         assertEquals(0, map.size());
@@ -104,8 +103,9 @@
 
     @SuppressWarnings("unchecked")
     public void testMapGet4() {
-        final HashMap<K, V> base = new HashMap<K, V>();
+        final HashMap<K, V> base = new HashMap<>();
         final Map<K, V> map = DefaultedMap.defaultedMap(base, new Transformer<K, V>() {
+            @Override
             public V transform(final K input) {
                 if (input instanceof String) {
                     return (V) "NULL";
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/EmptyMapMutator.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/EmptyMapMutator.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/EmptyMapMutator.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/EmptyMapMutator.java	2018-07-08 00:18:18.000000000 +0000
@@ -28,6 +28,7 @@
     /** Serialization version */
     private static final long serialVersionUID = -2729718980002476794L;
 
+    @Override
     public void resolveCollision(final CompositeMap<K,V> composite,
     final Map<K,V> existing,
     final Map<K,V> added,
@@ -35,10 +36,12 @@
         // Do nothing
     }
 
+    @Override
     public V put(final CompositeMap<K, V> map, final Map<K, V>[] composited, final K key, final V value) {
         return composited[0].put(key, value);
     }
 
+    @Override
     public void putAll(final CompositeMap<K, V> map, final Map<K, V>[] composited, final Map<? extends K, ? extends V> t) {
         composited[0].putAll(t);
     }
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/FixedSizeMapTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/FixedSizeMapTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/FixedSizeMapTest.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/FixedSizeMapTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -26,7 +26,6 @@
  * implementation.
  *
  * @since 3.0
- * @version $Id: FixedSizeMapTest.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 public class FixedSizeMapTest<K, V> extends AbstractIterableMapTest<K, V> {
 
@@ -41,7 +40,7 @@
 
     @Override
     public IterableMap<K, V> makeFullMap() {
-        final Map<K, V> map = new HashMap<K, V>();
+        final Map<K, V> map = new HashMap<>();
         addSampleMappings(map);
         return FixedSizeMap.fixedSizeMap(map);
     }
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/FixedSizeSortedMapTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/FixedSizeSortedMapTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/FixedSizeSortedMapTest.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/FixedSizeSortedMapTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -28,7 +28,6 @@
  * implementation.
  *
  * @since 3.0
- * @version $Id: FixedSizeSortedMapTest.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 public class FixedSizeSortedMapTest<K, V> extends AbstractSortedMapTest<K, V> {
 
@@ -48,7 +47,7 @@
 
     @Override
     public SortedMap<K, V> makeFullMap() {
-        final SortedMap<K, V> map = new TreeMap<K, V>();
+        final SortedMap<K, V> map = new TreeMap<>();
         addSampleMappings(map);
         return FixedSizeSortedMap.fixedSizeSortedMap(map);
     }
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/Flat3MapTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -20,6 +20,7 @@
 import java.io.ByteArrayOutputStream;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
@@ -33,7 +34,6 @@
 /**
  * JUnit tests.
  *
- * @version $Id: Flat3MapTest.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 public class Flat3MapTest<K, V> extends AbstractIterableMapTest<K, V> {
 
@@ -54,7 +54,7 @@
 
     @Override
     public Flat3Map<K, V> makeObject() {
-        return new Flat3Map<K, V>();
+        return new Flat3Map<>();
     }
 
     //-----------------------------------------------------------------------
@@ -410,22 +410,22 @@
 //    }
 
     public void testCollections261() {
-        final Flat3Map<Integer, Integer> m = new Flat3Map<Integer, Integer>();
+        final Flat3Map<Integer, Integer> m = new Flat3Map<>();
         m.put( Integer.valueOf(1), Integer.valueOf(1) );
         m.put( Integer.valueOf(0), Integer.valueOf(0) );
-        assertEquals( Integer.valueOf(1), m.remove( Integer.valueOf(1) ) ); 
-        assertEquals( Integer.valueOf(0), m.remove( Integer.valueOf(0) ) ); 
+        assertEquals( Integer.valueOf(1), m.remove( Integer.valueOf(1) ) );
+        assertEquals( Integer.valueOf(0), m.remove( Integer.valueOf(0) ) );
 
         m.put( Integer.valueOf(2), Integer.valueOf(2) );
         m.put( Integer.valueOf(1), Integer.valueOf(1) );
         m.put( Integer.valueOf(0), Integer.valueOf(0) );
-        assertEquals( Integer.valueOf(2), m.remove( Integer.valueOf(2) ) ); 
-        assertEquals( Integer.valueOf(1), m.remove( Integer.valueOf(1) ) ); 
-        assertEquals( Integer.valueOf(0), m.remove( Integer.valueOf(0) ) ); 
+        assertEquals( Integer.valueOf(2), m.remove( Integer.valueOf(2) ) );
+        assertEquals( Integer.valueOf(1), m.remove( Integer.valueOf(1) ) );
+        assertEquals( Integer.valueOf(0), m.remove( Integer.valueOf(0) ) );
     }
 
     public void testToString() {
-        final Flat3Map<Integer, Integer> m = new Flat3Map<Integer, Integer>();
+        final Flat3Map<Integer, Integer> m = new Flat3Map<>();
         final String string0 = m.toString();
         assertNotNull(string0);
         m.put( Integer.valueOf(1), Integer.valueOf(1) );
@@ -444,4 +444,365 @@
         assertNotSame(string1, string3);
         assertNotSame(string2, string3);
     }
+
+    public void testRemove1() {
+        final Flat3Map<Integer, Integer> m = new Flat3Map<>();
+
+        // object is not existing
+        Object obj = m.remove(44);
+        assertNull(obj);
+
+        m.put(ONE, ONE);
+        obj = m.remove(ONE);
+        assertSame(ONE, obj);
+        assertEquals(0, m.size());
+
+        // after removal, be no longer there
+        obj = m.get(ONE);
+        assertNull(obj);
+
+        m.put(ONE, ONE);
+        m.put(TWO, TWO);
+        m.put(THREE, THREE);
+
+        obj = m.remove(ONE);
+        assertSame(ONE, obj);
+
+        obj = m.get(ONE);
+        assertNull(obj);
+        obj = m.get(TWO);
+        assertSame(TWO, obj);
+    }
+
+    public void testRemove2() {
+        final Flat3Map<Integer, Integer> m = new Flat3Map<>();
+        Object obj;
+
+        m.put(ONE, ONE);
+        m.put(TWO, TWO);
+        m.put(THREE, THREE);
+
+        obj = m.remove(ONE);
+        assertSame(ONE, obj);
+
+        obj = m.get(ONE);
+        assertNull(obj);
+        obj = m.get(TWO);
+        assertSame(TWO, obj);
+        obj = m.get(THREE);
+        assertSame(THREE, obj);
+    }
+
+    public void testRemove3() {
+        final Flat3Map<Integer, Integer> m = new Flat3Map<>();
+        Object obj;
+
+        m.put(ONE, ONE);
+        m.put(TWO, TWO);
+        m.put(THREE, THREE);
+
+        obj = m.remove(TWO);
+        assertSame(TWO, obj);
+
+        obj = m.get(ONE);
+        assertSame(ONE, obj);
+        obj = m.get(TWO);
+        assertNull(obj);
+        obj = m.get(THREE);
+        assertSame(THREE, obj);
+    }
+
+    public void testRemove4() {
+        final Flat3Map<Integer, Integer> m = new Flat3Map<>();
+        Object obj;
+
+        m.put(ONE, ONE);
+        m.put(TWO, TWO);
+        m.put(THREE, THREE);
+
+        obj = m.remove(THREE);
+        assertSame(THREE, obj);
+
+        obj = m.get(ONE);
+        assertSame(ONE, obj);
+        obj = m.get(TWO);
+        assertSame(TWO, obj);
+        obj = m.get(THREE);
+        assertNull(obj);
+    }
+
+    public void testRemove5() {
+        final Flat3Map<Integer, Integer> m = new Flat3Map<>();
+        Object obj;
+
+        m.put(null, ONE);
+
+        obj = m.remove(null);
+        assertSame(ONE, obj);
+
+        obj = m.get(null);
+        assertNull(obj);
+    }
+
+    public void testRemove6() {
+        final Flat3Map<Integer, Integer> m = new Flat3Map<>();
+        Object obj;
+
+        m.put(ONE, ONE);
+        m.put(null, TWO);
+
+        obj = m.remove(null);
+        assertSame(TWO, obj);
+
+        obj = m.get(ONE);
+        assertSame(ONE, obj);
+        obj = m.get(null);
+        assertNull(obj);
+    }
+
+    public void testRemove7() {
+        final Flat3Map<Integer, Integer> m = new Flat3Map<>();
+        Object obj;
+
+        m.put(null, ONE);
+        m.put(TWO, TWO);
+
+        obj = m.remove(null);
+        assertSame(ONE, obj);
+
+        obj = m.get(null);
+        assertNull(obj);
+        obj = m.get(TWO);
+        assertSame(TWO, obj);
+    }
+
+    public void testRemove8() {
+        final Flat3Map<Integer, Integer> m = new Flat3Map<>();
+        Object obj;
+
+        m.put(ONE, ONE);
+        m.put(TWO, TWO);
+        m.put(null, THREE);
+
+        obj = m.remove(null);
+        assertSame(THREE, obj);
+
+        obj = m.get(ONE);
+        assertSame(ONE, obj);
+        obj = m.get(TWO);
+        assertSame(TWO, obj);
+        obj = m.get(null);
+        assertNull(obj);
+    }
+
+    public void testRemove9() {
+        final Flat3Map<Integer, Integer> m = new Flat3Map<>();
+        Object obj;
+
+        m.put(ONE, ONE);
+
+        obj = m.remove(null);
+        assertNull(obj);
+    }
+
+    public void testRemove10() {
+        final Flat3Map<Integer, Integer> m = new Flat3Map<>();
+        Object obj;
+
+        m.put(ONE, ONE);
+        m.put(TWO, TWO);
+
+        obj = m.remove(null);
+        assertNull(obj);
+    }
+
+    public void testRemove11() {
+        final Flat3Map<Integer, Integer> m = new Flat3Map<>();
+        Object obj;
+
+        m.put(ONE, ONE);
+        m.put(TWO, TWO);
+        m.put(THREE, THREE);
+
+        obj = m.remove(null);
+        assertNull(obj);
+    }
+
+    public void testRemove12() {
+        final Flat3Map<Integer, Integer> m = new Flat3Map<>();
+        Object obj;
+
+        m.put(ONE, ONE);
+        m.put(TWO, TWO);
+        m.put(THREE, THREE);
+
+        obj = m.remove(42);
+        assertNull(obj);
+    }
+
+    public void testRemove13() {
+        final Flat3Map<Integer, Integer> m = new Flat3Map<>();
+        Object obj;
+
+        m.put(ONE, ONE);
+        m.put(TWO, TWO);
+
+        obj = m.remove(42);
+        assertNull(obj);
+    }
+
+    public void testNewInstance1() {
+        final Map<Integer, Integer> orig = new HashMap<>();
+        orig.put(ONE, ONE);
+        orig.put(TWO, TWO);
+
+        final Flat3Map<Integer, Integer> m = new Flat3Map<>(orig);
+
+        assertEquals(orig, m);
+        assertEquals(2, m.size());
+    }
+
+    public void testGet1() {
+        final Flat3Map<Integer, Integer> m = new Flat3Map<>();
+        Object obj;
+
+        m.put(null, ONE);
+        obj = m.get(null);
+        assertSame(ONE, obj);
+    }
+
+    public void testGet2() {
+        final Flat3Map<Integer, Integer> m = new Flat3Map<>();
+        Object obj;
+
+        m.put(ONE, ONE);
+        m.put(null, TWO);
+        obj = m.get(null);
+        assertSame(TWO, obj);
+    }
+
+    public void testGet3() {
+        final Flat3Map<Integer, Integer> m = new Flat3Map<>();
+        Object obj;
+
+        m.put(ONE, ONE);
+        m.put(TWO, TWO);
+        m.put(null, THREE);
+        obj = m.get(null);
+        assertSame(THREE, obj);
+    }
+
+    public void testContainsKey1() {
+        final Flat3Map<Integer, Integer> m = new Flat3Map<>();
+
+        m.put(ONE, ONE);
+        m.put(TWO, TWO);
+        m.put(null, THREE);
+        final boolean contains = m.containsKey(null);
+        assertEquals(true, contains);
+    }
+
+    public void testContainsKey2() {
+        final Flat3Map<Integer, Integer> m = new Flat3Map<>();
+
+        m.put(ONE, ONE);
+        m.put(null, TWO);
+        final boolean contains = m.containsKey(null);
+        assertEquals(true, contains);
+    }
+
+    public void testContainsKey3() {
+        final Flat3Map<Integer, Integer> m = new Flat3Map<>();
+
+        m.put(null, ONE);
+        final boolean contains = m.containsKey(null);
+        assertEquals(true, contains);
+    }
+
+    public void testContainsValue1() {
+        final Flat3Map<Integer, Integer> m = new Flat3Map<>();
+
+        m.put(ONE, ONE);
+        m.put(TWO, TWO);
+        m.put(THREE, null);
+        final boolean contains = m.containsValue(null);
+        assertEquals(true, contains);
+    }
+
+    public void testContainsValue2() {
+        final Flat3Map<Integer, Integer> m = new Flat3Map<>();
+
+        m.put(ONE, ONE);
+        m.put(TWO, null);
+        final boolean contains = m.containsValue(null);
+        assertEquals(true, contains);
+    }
+
+    public void testContainsValue3() {
+        final Flat3Map<Integer, Integer> m = new Flat3Map<>();
+
+        m.put(ONE, null);
+        final boolean contains = m.containsValue(null);
+        assertEquals(true, contains);
+    }
+
+    public void testPut1() {
+        final Flat3Map<Integer, Integer> m = new Flat3Map<>();
+
+        m.put(ONE, ONE);
+        m.put(TWO, TWO);
+        m.put(null, THREE);
+        final Object old = m.put(null, ONE);
+        assertEquals(THREE, old);
+        assertEquals(ONE, m.get(null));
+    }
+
+    public void testPut2() {
+        final Flat3Map<Integer, Integer> m = new Flat3Map<>();
+
+        m.put(ONE, ONE);
+        m.put(null, THREE);
+        final Object old = m.put(null, ONE);
+        assertEquals(THREE, old);
+        assertEquals(ONE, m.get(null));
+    }
+
+    public void testPut3() {
+        final Flat3Map<Integer, Integer> m = new Flat3Map<>();
+
+        m.put(null, THREE);
+        final Object old = m.put(null, ONE);
+        assertEquals(THREE, old);
+        assertEquals(null, m.get(ONE));
+    }
+
+    public void testPut4() {
+        final Flat3Map<Integer, Integer> m = new Flat3Map<>();
+
+        m.put(ONE, ONE);
+        m.put(TWO, TWO);
+        m.put(THREE, THREE);
+        final Object old = m.put(THREE, ONE);
+        assertEquals(THREE, old);
+        assertEquals(ONE, m.get(THREE));
+    }
+
+    public void testPut5() {
+        final Flat3Map<Integer, Integer> m = new Flat3Map<>();
+
+        m.put(ONE, ONE);
+        m.put(TWO, THREE);
+        final Object old = m.put(TWO, ONE);
+        assertEquals(THREE, old);
+        assertEquals(ONE, m.get(TWO));
+    }
+
+    public void testPut6() {
+        final Flat3Map<Integer, Integer> m = new Flat3Map<>();
+
+        m.put(ONE, THREE);
+        final Object old = m.put(ONE, ONE);
+        assertEquals(THREE, old);
+        assertEquals(ONE, m.get(ONE));
+    }
 }
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/HashedMapTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/HashedMapTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/HashedMapTest.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/HashedMapTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -23,7 +23,6 @@
 /**
  * JUnit tests.
  *
- * @version $Id: HashedMapTest.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 public class HashedMapTest<K, V> extends AbstractIterableMapTest<K, V> {
 
@@ -37,7 +36,7 @@
 
     @Override
     public HashedMap<K, V> makeObject() {
-        return new HashedMap<K, V>();
+        return new HashedMap<>();
     }
 
     @Override
@@ -47,7 +46,7 @@
 
     @SuppressWarnings("unchecked")
     public void testClone() {
-        final HashedMap<K, V> map = new HashedMap<K, V>(10);
+        final HashedMap<K, V> map = new HashedMap<>(10);
         map.put((K) "1", (V) "1");
         final HashedMap<K, V> cloned = map.clone();
         assertEquals(map.size(), cloned.size());
@@ -55,7 +54,7 @@
     }
 
     public void testInternalState() {
-        final HashedMap<K, V> map = new HashedMap<K, V>(42, 0.75f);
+        final HashedMap<K, V> map = new HashedMap<>(42, 0.75f);
         assertEquals(0.75f, map.loadFactor, 0.1f);
         assertEquals(0, map.size);
         assertEquals(64, map.data.length);
@@ -74,7 +73,7 @@
      * Test for <a href="https://issues.apache.org/jira/browse/COLLECTIONS-323">COLLECTIONS-323</a>.
      */
     public void testInitialCapacityZero() {
-        final HashedMap<String,String> map = new HashedMap<String,String>(0);
+        final HashedMap<String,String> map = new HashedMap<>(0);
         assertEquals(1, map.data.length);
     }
 }
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/IdentityMap.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/IdentityMap.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/IdentityMap.java	2013-11-11 21:58:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/IdentityMap.java	2018-07-08 00:18:18.000000000 +0000
@@ -40,8 +40,9 @@
  * From 4.0, this class is replaced by java.util.IdentityHashMap but kept as a
  * test-class because it is still used by the ReferenceIdentityMapTest.
  *
+ * @param <K> the type of the keys in this map
+ * @param <V> the type of the values in this map
  * @since 3.0
- * @version $Id: IdentityMap.java 1540860 2013-11-11 21:58:27Z ebourg $
  */
 public class IdentityMap<K, V>
         extends AbstractHashedMap<K, V> implements Serializable, Cloneable {
@@ -141,7 +142,7 @@
     @Override
     protected IdentityEntry<K, V> createEntry(final HashEntry<K, V> next, final int hashCode,
                                               final K key, final V value) {
-        return new IdentityEntry<K, V>(next, hashCode, key, value);
+        return new IdentityEntry<>(next, hashCode, key, value);
     }
 
     //-----------------------------------------------------------------------
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/LazyMapTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/LazyMapTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/LazyMapTest.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/LazyMapTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -27,11 +27,10 @@
 import org.junit.Test;
 
 /**
- * Extension of {@link AbstractMapTest} for exercising the 
+ * Extension of {@link AbstractMapTest} for exercising the
  * {@link LazyMap} implementation.
  *
  * @since 3.0
- * @version $Id: LazyMapTest.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 @SuppressWarnings("boxing")
 public class LazyMapTest<K, V> extends AbstractIterableMapTest<K, V> {
@@ -74,6 +73,7 @@
     @Test
     public void mapGetWithTransformer() {
         final Transformer<Number, Integer> intConverter = new Transformer<Number, Integer>(){
+            @Override
             public Integer transform(final Number input) {
                 return input.intValue();
             }
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/LazySortedMapTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/LazySortedMapTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/LazySortedMapTest.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/LazySortedMapTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -34,7 +34,6 @@
  * {@link LazySortedMap} implementation.
  *
  * @since 3.0
- * @version $Id: LazySortedMapTest.java 1686855 2015-06-22 13:00:27Z tn $
  */
 @SuppressWarnings("boxing")
 public class LazySortedMapTest<K, V> extends AbstractSortedMapTest<K, V> {
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/LinkedMapTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/LinkedMapTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/LinkedMapTest.java	2013-11-11 21:58:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/LinkedMapTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -32,7 +32,6 @@
 /**
  * JUnit tests.
  *
- * @version $Id: LinkedMapTest.java 1540860 2013-11-11 21:58:27Z ebourg $
  */
 public class LinkedMapTest<K, V> extends AbstractOrderedMapTest<K, V> {
 
@@ -46,7 +45,7 @@
 
     @Override
     public LinkedMap<K, V> makeObject() {
-        return new LinkedMap<K, V>();
+        return new LinkedMap<>();
     }
 
     /**
@@ -71,7 +70,7 @@
 
         resetFull();
         ordered = getMap();
-        final List<K> list = new ArrayList<K>(ordered.keySet());
+        final List<K> list = new ArrayList<>(ordered.keySet());
         final ResettableIterator<K> it = (ResettableIterator<K>) ordered.mapIterator();
         assertSame(list.get(0), it.next());
         assertSame(list.get(1), it.next());
@@ -186,7 +185,7 @@
 
         resetFull();
         lm = getMap();
-        final List<K> list = new ArrayList<K>();
+        final List<K> list = new ArrayList<>();
         for (final MapIterator<K, V> it = lm.mapIterator(); it.hasNext();) {
             list.add(it.next());
         }
@@ -214,7 +213,7 @@
             lm.remove(lm.size());
         } catch (final IndexOutOfBoundsException ex) {}
 
-        final List<K> list = new ArrayList<K>();
+        final List<K> list = new ArrayList<>();
         for (final MapIterator<K, V> it = lm.mapIterator(); it.hasNext();) {
             list.add(it.next());
         }
@@ -275,7 +274,7 @@
 
     @SuppressWarnings("unchecked")
     public void testClone() {
-        final LinkedMap<K, V> map = new LinkedMap<K, V>(10);
+        final LinkedMap<K, V> map = new LinkedMap<>(10);
         map.put((K) "1", (V) "1");
         final Map<K, V> cloned = map.clone();
         assertEquals(map.size(), cloned.size());
@@ -301,7 +300,7 @@
      * Test for <a href="https://issues.apache.org/jira/browse/COLLECTIONS-323">COLLECTIONS-323</a>.
      */
     public void testInitialCapacityZero() {
-        final LinkedMap<String,String> map = new LinkedMap<String,String>(0);
+        final LinkedMap<String,String> map = new LinkedMap<>(0);
         assertEquals(1, map.data.length);
     }
 }
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/ListOrderedMap2Test.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/ListOrderedMap2Test.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/ListOrderedMap2Test.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/ListOrderedMap2Test.java	2018-07-08 00:18:18.000000000 +0000
@@ -30,7 +30,6 @@
  * implementation.
  *
  * @since 3.1
- * @version $Id: ListOrderedMap2Test.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 public class ListOrderedMap2Test<K, V> extends AbstractOrderedMapTest<K, V> {
 
@@ -44,7 +43,7 @@
 
     @Override
     public ListOrderedMap<K, V> makeObject() {
-        return new ListOrderedMap<K, V>();
+        return new ListOrderedMap<>();
     }
 
     /**
@@ -114,7 +113,7 @@
 
         resetFull();
         lom = getMap();
-        final List<K> list = new ArrayList<K>();
+        final List<K> list = new ArrayList<>();
         for (final MapIterator<K, V> it = lom.mapIterator(); it.hasNext();) {
             list.add(it.next());
         }
@@ -142,7 +141,7 @@
             lom.remove(lom.size());
         } catch (final IndexOutOfBoundsException ex) {}
 
-        final List<K> list = new ArrayList<K>();
+        final List<K> list = new ArrayList<>();
         for (final MapIterator<K, V> it = lom.mapIterator(); it.hasNext();) {
             list.add(it.next());
         }
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/ListOrderedMapTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/ListOrderedMapTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/ListOrderedMapTest.java	2013-11-20 21:53:39.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/ListOrderedMapTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -33,7 +33,6 @@
  * implementation.
  *
  * @since 3.0
- * @version $Id: ListOrderedMapTest.java 1543964 2013-11-20 21:53:39Z tn $
  */
 public class ListOrderedMapTest<K, V> extends AbstractOrderedMapTest<K, V> {
 
@@ -117,7 +116,7 @@
 
         resetFull();
         lom = getMap();
-        final List<K> list = new ArrayList<K>();
+        final List<K> list = new ArrayList<>();
         for (final MapIterator<K, V> it = lom.mapIterator(); it.hasNext();) {
             list.add(it.next());
         }
@@ -173,7 +172,7 @@
             lom.remove(lom.size());
         } catch (final IndexOutOfBoundsException ex) {}
 
-        final List<K> list = new ArrayList<K>();
+        final List<K> list = new ArrayList<>();
         for (final MapIterator<K, V> it = lom.mapIterator(); it.hasNext();) {
             list.add(it.next());
         }
@@ -222,7 +221,7 @@
         // put in a full map
         resetFull();
         lom = getMap();
-        final ListOrderedMap<K, V> lom2 = new ListOrderedMap<K, V>();
+        final ListOrderedMap<K, V> lom2 = new ListOrderedMap<>();
         lom2.putAll(lom);
 
         lom2.put(0, (K) "testInsert0", (V) "testInsert0v");
@@ -317,7 +316,7 @@
         assertEquals("testInsert2v", lom.getValue(2));
 
         // Create New Test Map and Add using putAll(int, Object, Object)
-        final Map<String, String> values = new ListOrderedMap<String, String>();
+        final Map<String, String> values = new ListOrderedMap<>();
         values.put("NewInsert0", "NewInsert0v");
         values.put("NewInsert1", "NewInsert1v");
         lom.putAll(1, values);
@@ -341,7 +340,7 @@
             lom.put((K) Integer.valueOf(i), (V) Boolean.TRUE);
         }
 
-        final Map<K, V> map = new TreeMap<K, V>();
+        final Map<K, V> map = new TreeMap<>();
         for (int i = 0; i < size; i++) {
             map.put((K) Integer.valueOf(i), (V) Boolean.FALSE);
         }
@@ -387,13 +386,13 @@
     }
 
     public void testCOLLECTIONS_474_nullValues () {
-        Object key1 = new Object();
-        Object key2 = new Object();
-        HashMap<Object, Object> hmap = new HashMap<Object, Object>();
+        final Object key1 = new Object();
+        final Object key2 = new Object();
+        final HashMap<Object, Object> hmap = new HashMap<>();
         hmap.put(key1, null);
         hmap.put(key2, null);
         assertEquals("Should have two elements", 2, hmap.size());
-        ListOrderedMap<Object, Object> listMap = new ListOrderedMap<Object, Object>();
+        final ListOrderedMap<Object, Object> listMap = new ListOrderedMap<>();
         listMap.put(key1, null);
         listMap.put(key2, null);
         assertEquals("Should have two elements", 2, listMap.size());
@@ -401,13 +400,13 @@
     }
 
     public void testCOLLECTIONS_474_nonNullValues () {
-        Object key1 = new Object();
-        Object key2 = new Object();
-        HashMap<Object, Object> hmap = new HashMap<Object, Object>();
+        final Object key1 = new Object();
+        final Object key2 = new Object();
+        final HashMap<Object, Object> hmap = new HashMap<>();
         hmap.put(key1, "1");
         hmap.put(key2, "2");
         assertEquals("Should have two elements", 2, hmap.size());
-        ListOrderedMap<Object, Object> listMap = new ListOrderedMap<Object, Object>();
+        final ListOrderedMap<Object, Object> listMap = new ListOrderedMap<>();
         listMap.put(key1, "3");
         listMap.put(key2, "4");
         assertEquals("Should have two elements", 2, listMap.size());
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/LRUMapTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/LRUMapTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/LRUMapTest.java	2015-06-01 10:12:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/LRUMapTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -32,7 +32,6 @@
 /**
  * JUnit tests.
  *
- * @version $Id: LRUMapTest.java 1682859 2015-06-01 10:12:13Z tn $
  */
 public class LRUMapTest<K, V> extends AbstractOrderedMapTest<K, V> {
 
@@ -46,7 +45,7 @@
 
     @Override
     public LRUMap<K, V> makeObject() {
-        return new LRUMap<K, V>();
+        return new LRUMap<>();
     }
 
     /**
@@ -75,42 +74,42 @@
         try {
             new LRUMap<K, V>(0);
             fail("maxSize must be positive");
-        } catch(IllegalArgumentException ex) {
+        } catch(final IllegalArgumentException ex) {
             // expected
         }
 
         try {
             new LRUMap<K, V>(-1, 12, 0.75f, false);
             fail("maxSize must be positive");
-        } catch(IllegalArgumentException ex) {
+        } catch(final IllegalArgumentException ex) {
             // expected
         }
 
         try {
             new LRUMap<K, V>(10, -1);
             fail("initialSize must not be negative");
-        } catch(IllegalArgumentException ex) {
+        } catch(final IllegalArgumentException ex) {
             // expected
         }
 
         try {
             new LRUMap<K, V>(10, 12);
             fail("initialSize must not be larger than maxSize");
-        } catch(IllegalArgumentException ex) {
+        } catch(final IllegalArgumentException ex) {
             // expected
         }
 
         try {
             new LRUMap<K, V>(10, -1, 0.75f, false);
             fail("initialSize must not be negative");
-        } catch(IllegalArgumentException ex) {
+        } catch(final IllegalArgumentException ex) {
             // expected
         }
 
         try {
             new LRUMap<K, V>(10, 12, 0.75f, false);
             fail("initialSize must not be larger than maxSize");
-        } catch(IllegalArgumentException ex) {
+        } catch(final IllegalArgumentException ex) {
             // expected
         }
     }
@@ -124,7 +123,7 @@
         Iterator<K> kit;
         Iterator<V> vit;
 
-        final LRUMap<K, V> map = new LRUMap<K, V>(2);
+        final LRUMap<K, V> map = new LRUMap<>(2);
         assertEquals(0, map.size());
         assertEquals(false, map.isFull());
         assertEquals(2, map.maxSize());
@@ -188,7 +187,7 @@
 
         resetFull();
         ordered = getMap();
-        final List<K> list = new ArrayList<K>(ordered.keySet());
+        final List<K> list = new ArrayList<>(ordered.keySet());
         final ResettableIterator<K> it = (ResettableIterator<K>) ordered.mapIterator();
         assertSame(list.get(0), it.next());
         assertSame(list.get(1), it.next());
@@ -281,8 +280,8 @@
         Iterator<V> vit = null;
 
         resetEmpty();
-        LRUMap<K, V> lruMap = (LRUMap<K, V>) map;
-        
+        final LRUMap<K, V> lruMap = (LRUMap<K, V>) map;
+
         lruMap.put(keys[0], values[0]);
         lruMap.put(keys[1], values[1]);
         kit = lruMap.keySet().iterator();
@@ -322,7 +321,7 @@
 
     @SuppressWarnings("unchecked")
     public void testClone() {
-        final LRUMap<K, V> map = new LRUMap<K, V>(10);
+        final LRUMap<K, V> map = new LRUMap<>(10);
         map.put((K) "1", (V) "1");
         final Map<K, V> cloned = map.clone();
         assertEquals(map.size(), cloned.size());
@@ -331,7 +330,7 @@
 
     @SuppressWarnings("unchecked")
     public void testRemoveLRU() {
-        final MockLRUMapSubclass<K, String> map = new MockLRUMapSubclass<K, String>(2);
+        final MockLRUMapSubclass<K, String> map = new MockLRUMapSubclass<>(2);
         assertNull(map.entry);
         map.put((K) "A", "a");
         assertNull(map.entry);
@@ -372,7 +371,7 @@
 
     @SuppressWarnings("unchecked")
     public void testRemoveLRUBlocksRemove() {
-        final MockLRUMapSubclassBlocksRemove<K, V> map = new MockLRUMapSubclassBlocksRemove<K, V>(2, false);
+        final MockLRUMapSubclassBlocksRemove<K, V> map = new MockLRUMapSubclassBlocksRemove<>(2, false);
         assertEquals(0, map.size());
         map.put((K) "A", (V) "a");
         assertEquals(1, map.size());
@@ -388,7 +387,7 @@
 
     @SuppressWarnings("unchecked")
     public void testRemoveLRUBlocksRemoveScan() {
-        final MockLRUMapSubclassBlocksRemove<K, V> map = new MockLRUMapSubclassBlocksRemove<K, V>(2, true);
+        final MockLRUMapSubclassBlocksRemove<K, V> map = new MockLRUMapSubclassBlocksRemove<>(2, true);
         assertEquals(0, map.size());
         map.put((K) "A", (V) "a");
         assertEquals(1, map.size());
@@ -420,7 +419,7 @@
 
     @SuppressWarnings("unchecked")
     public void testRemoveLRUFirstBlocksRemove() {
-        final MockLRUMapSubclassFirstBlocksRemove<K, V> map = new MockLRUMapSubclassFirstBlocksRemove<K, V>(2);
+        final MockLRUMapSubclassFirstBlocksRemove<K, V> map = new MockLRUMapSubclassFirstBlocksRemove<>(2);
         assertEquals(0, map.size());
         map.put((K) "A", (V) "a");
         assertEquals(1, map.size());
@@ -448,9 +447,8 @@
         protected boolean removeLRU(final LinkEntry<K, V> entry) {
             if ("a".equals(entry.getValue())) {
                 return false;
-            } else {
-                return true;
             }
+            return true;
         }
     }
 
@@ -484,7 +482,7 @@
         final SingleHashCode five = new SingleHashCode("5");
         final SingleHashCode six = new SingleHashCode("6");
 
-        final LRUMap<K, V> map = new LRUMap<K, V>(3, 1.0f);
+        final LRUMap<K, V> map = new LRUMap<>(3, 1.0f);
         final int hashIndex = map.hashIndex(map.hash(one), 4);
         map.put((K) one, (V) "A");
         map.put((K) two, (V) "B");
@@ -571,7 +569,7 @@
         final SingleHashCode two = new SingleHashCode("2");
         final SingleHashCode three = new SingleHashCode("3");
 
-        final LRUMap<K, V> map = new LRUMap<K, V>(3, 1.0f);
+        final LRUMap<K, V> map = new LRUMap<>(3, 1.0f);
         map.put((K) one, (V) "A");
         map.put((K) two, (V) "B");
         map.put((K) three, (V) "C");
@@ -591,9 +589,9 @@
 
     public void testSynchronizedRemoveFromMapIterator() throws InterruptedException {
 
-        final LRUMap<Object, Thread> map = new LRUMap<Object, Thread>(10000);
+        final LRUMap<Object, Thread> map = new LRUMap<>(10000);
 
-        final Map<Throwable, String> exceptions = new HashMap<Throwable, String>();
+        final Map<Throwable, String> exceptions = new HashMap<>();
         final ThreadGroup tg = new ThreadGroup(getName()) {
             @Override
             public void uncaughtException(final Thread t, final Throwable e) {
@@ -674,9 +672,9 @@
 
     public void testSynchronizedRemoveFromEntrySet() throws InterruptedException {
 
-        final Map<Object, Thread> map = new LRUMap<Object, Thread>(10000);
+        final Map<Object, Thread> map = new LRUMap<>(10000);
 
-        final Map<Throwable, String> exceptions = new HashMap<Throwable, String>();
+        final Map<Throwable, String> exceptions = new HashMap<>();
         final ThreadGroup tg = new ThreadGroup(getName()) {
             @Override
             public void uncaughtException(final Thread t, final Throwable e) {
@@ -757,9 +755,9 @@
 
     public void testSynchronizedRemoveFromKeySet() throws InterruptedException {
 
-        final Map<Object, Thread> map = new LRUMap<Object, Thread>(10000);
+        final Map<Object, Thread> map = new LRUMap<>(10000);
 
-        final Map<Throwable, String> exceptions = new HashMap<Throwable, String>();
+        final Map<Throwable, String> exceptions = new HashMap<>();
         final ThreadGroup tg = new ThreadGroup(getName()) {
             @Override
             public void uncaughtException(final Thread t, final Throwable e) {
@@ -840,9 +838,9 @@
 
     public void testSynchronizedRemoveFromValues() throws InterruptedException {
 
-        final Map<Object, Thread> map = new LRUMap<Object, Thread>(10000);
+        final Map<Object, Thread> map = new LRUMap<>(10000);
 
-        final Map<Throwable, String> exceptions = new HashMap<Throwable, String>();
+        final Map<Throwable, String> exceptions = new HashMap<>();
         final ThreadGroup tg = new ThreadGroup(getName()) {
             @Override
             public void uncaughtException(final Thread t, final Throwable e) {
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/MultiKeyMapTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/MultiKeyMapTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/MultiKeyMapTest.java	2014-05-06 21:38:05.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/MultiKeyMapTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -27,7 +27,6 @@
 /**
  * JUnit tests.
  *
- * @version $Id: MultiKeyMapTest.java 1592893 2014-05-06 21:38:05Z tn $
  */
 public class MultiKeyMapTest<K, V> extends AbstractIterableMapTest<MultiKey<? extends K>, V> {
 
@@ -50,7 +49,7 @@
 
     @Override
     public MultiKeyMap<K, V> makeObject() {
-        return new MultiKeyMap<K, V>();
+        return new MultiKeyMap<>();
     }
 
     @Override
@@ -61,18 +60,18 @@
     @SuppressWarnings("unchecked")
     private MultiKey<K>[] getMultiKeyKeys() {
         return new MultiKey[] {
-            new MultiKey<Integer>(I1, I2),
-            new MultiKey<Integer>(I2, I3),
-            new MultiKey<Integer>(I3, I4),
-            new MultiKey<Integer>(I1, I1, I2),
-            new MultiKey<Integer>(I2, I3, I4),
-            new MultiKey<Integer>(I3, I7, I6),
-            new MultiKey<Integer>(I1, I1, I2, I3),
-            new MultiKey<Integer>(I2, I4, I5, I6),
-            new MultiKey<Integer>(I3, I6, I7, I8),
-            new MultiKey<Integer>(I1, I1, I2, I3, I4),
-            new MultiKey<Integer>(I2, I3, I4, I5, I6),
-            new MultiKey<Integer>(I3, I5, I6, I7, I8),
+            new MultiKey<>(I1, I2),
+            new MultiKey<>(I2, I3),
+            new MultiKey<>(I3, I4),
+            new MultiKey<>(I1, I1, I2),
+            new MultiKey<>(I2, I3, I4),
+            new MultiKey<>(I3, I7, I6),
+            new MultiKey<>(I1, I1, I2, I3),
+            new MultiKey<>(I2, I4, I5, I6),
+            new MultiKey<>(I3, I6, I7, I8),
+            new MultiKey<>(I1, I1, I2, I3, I4),
+            new MultiKey<>(I2, I3, I4, I5, I6),
+            new MultiKey<>(I3, I5, I6, I7, I8),
         };
     }
 
@@ -102,10 +101,10 @@
     @SuppressWarnings("unchecked")
     public MultiKey<K>[] getOtherKeys() {
         return new MultiKey[] {
-            new MultiKey<Integer>(I1, I7),
-            new MultiKey<Integer>(I1, I8),
-            new MultiKey<Integer>(I2, I4),
-            new MultiKey<Integer>(I2, I5),
+            new MultiKey<>(I1, I7),
+            new MultiKey<>(I1, I8),
+            new MultiKey<>(I2, I4),
+            new MultiKey<>(I2, I5),
         };
     }
 
@@ -244,7 +243,7 @@
         final V[] values = getSampleValues();
 
         for (int i = 0; i < keys.length; i++) {
-            final MultiKeyMap<K, V> multimap = new MultiKeyMap<K, V>();
+            final MultiKeyMap<K, V> multimap = new MultiKeyMap<>();
 
             final MultiKey<K> key = keys[i];
             final V value = values[i];
@@ -255,7 +254,7 @@
                 assertEquals(1, multimap.size());
                 assertEquals(value, multimap.get(key.getKey(0), key.getKey(1)));
                 assertEquals(true, multimap.containsKey(key.getKey(0), key.getKey(1)));
-                assertEquals(true, multimap.containsKey(new MultiKey<K>(key.getKey(0), key.getKey(1))));
+                assertEquals(true, multimap.containsKey(new MultiKey<>(key.getKey(0), key.getKey(1))));
                 assertEquals(value, multimap.put(key.getKey(0), key.getKey(1), null));
                 assertEquals(1, multimap.size());
                 assertEquals(null, multimap.get(key.getKey(0), key.getKey(1)));
@@ -266,7 +265,7 @@
                 assertEquals(1, multimap.size());
                 assertEquals(value, multimap.get(key.getKey(0), key.getKey(1), key.getKey(2)));
                 assertEquals(true, multimap.containsKey(key.getKey(0), key.getKey(1), key.getKey(2)));
-                assertEquals(true, multimap.containsKey(new MultiKey<K>(key.getKey(0), key.getKey(1), key.getKey(2))));
+                assertEquals(true, multimap.containsKey(new MultiKey<>(key.getKey(0), key.getKey(1), key.getKey(2))));
                 assertEquals(value, multimap.put(key.getKey(0), key.getKey(1), key.getKey(2), null));
                 assertEquals(1, multimap.size());
                 assertEquals(null, multimap.get(key.getKey(0), key.getKey(1), key.getKey(2)));
@@ -277,7 +276,7 @@
                 assertEquals(1, multimap.size());
                 assertEquals(value, multimap.get(key.getKey(0), key.getKey(1), key.getKey(2), key.getKey(3)));
                 assertEquals(true, multimap.containsKey(key.getKey(0), key.getKey(1), key.getKey(2), key.getKey(3)));
-                assertEquals(true, multimap.containsKey(new MultiKey<K>(key.getKey(0), key.getKey(1), key.getKey(2), key.getKey(3))));
+                assertEquals(true, multimap.containsKey(new MultiKey<>(key.getKey(0), key.getKey(1), key.getKey(2), key.getKey(3))));
                 assertEquals(value, multimap.put(key.getKey(0), key.getKey(1), key.getKey(2), key.getKey(3), null));
                 assertEquals(1, multimap.size());
                 assertEquals(null, multimap.get(key.getKey(0), key.getKey(1), key.getKey(2), key.getKey(3)));
@@ -288,7 +287,7 @@
                 assertEquals(1, multimap.size());
                 assertEquals(value, multimap.get(key.getKey(0), key.getKey(1), key.getKey(2), key.getKey(3), key.getKey(4)));
                 assertEquals(true, multimap.containsKey(key.getKey(0), key.getKey(1), key.getKey(2), key.getKey(3), key.getKey(4)));
-                assertEquals(true, multimap.containsKey(new MultiKey<K>(key.getKey(0), key.getKey(1), key.getKey(2), key.getKey(3), key.getKey(4))));
+                assertEquals(true, multimap.containsKey(new MultiKey<>(key.getKey(0), key.getKey(1), key.getKey(2), key.getKey(3), key.getKey(4))));
                 assertEquals(value, multimap.put(key.getKey(0), key.getKey(1), key.getKey(2), key.getKey(3), key.getKey(4), null));
                 assertEquals(1, multimap.size());
                 assertEquals(null, multimap.get(key.getKey(0), key.getKey(1), key.getKey(2), key.getKey(3), key.getKey(4)));
@@ -301,7 +300,7 @@
     }
 
     public void testMultiKeyPutWithNullKey() {
-        final MultiKeyMap<String, String> map = new MultiKeyMap<String, String>();
+        final MultiKeyMap<String, String> map = new MultiKeyMap<>();
         map.put("a", null, "value1");
         map.put("b", null, "value2");
         map.put("c", null, "value3");
@@ -309,7 +308,7 @@
         map.put("a", null, "value5");
         map.put(null, "a", "value6");
         map.put(null, null, "value7");
-        
+
         assertEquals(6, map.size());
         assertEquals("value5", map.get("a", null));
         assertEquals("value4", map.get("a", "z"));
@@ -422,11 +421,11 @@
     //-----------------------------------------------------------------------
     @SuppressWarnings("unchecked")
     public void testClone() {
-        final MultiKeyMap<K, V> map = new MultiKeyMap<K, V>();
-        map.put(new MultiKey<K>((K) I1, (K) I2), (V) "1-2");
+        final MultiKeyMap<K, V> map = new MultiKeyMap<>();
+        map.put(new MultiKey<>((K) I1, (K) I2), (V) "1-2");
         final Map<MultiKey<? extends K>, V> cloned = map.clone();
         assertEquals(map.size(), cloned.size());
-        assertSame(map.get(new MultiKey<K>((K) I1, (K) I2)), cloned.get(new MultiKey<K>((K) I1, (K) I2)));
+        assertSame(map.get(new MultiKey<>((K) I1, (K) I2)), cloned.get(new MultiKey<>((K) I1, (K) I2)));
     }
 
     //-----------------------------------------------------------------------
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/MultiValueMapTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/MultiValueMapTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/MultiValueMapTest.java	2015-11-14 20:24:42.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/MultiValueMapTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -38,7 +38,6 @@
  * TestMultiValueMap.
  *
  * @since 3.2
- * @version $Id: MultiValueMapTest.java 1714360 2015-11-14 20:24:42Z tn $
  */
 @Deprecated
 public class MultiValueMapTest<K, V> extends AbstractObjectTest {
@@ -61,7 +60,7 @@
     @SuppressWarnings("unchecked")
     public void testMultipleValues() {
         final MultiValueMap<K, V> map = createTestMap(HashSet.class);
-        final HashSet<V> expected = new HashSet<V>();
+        final HashSet<V> expected = new HashSet<>();
         expected.add((V) "uno");
         expected.add((V) "un");
         assertEquals(expected, map.get("one"));
@@ -94,7 +93,7 @@
     @SuppressWarnings("unchecked")
     public void testValues() {
         final MultiValueMap<K, V> map = createTestMap(HashSet.class);
-        final HashSet<V> expected = new HashSet<V>();
+        final HashSet<V> expected = new HashSet<>();
         expected.add((V) "uno");
         expected.add((V) "dos");
         expected.add((V) "tres");
@@ -103,7 +102,7 @@
         expected.add((V) "trois");
         final Collection<Object> c = map.values();
         assertEquals(6, c.size());
-        assertEquals(expected, new HashSet<Object>(c));
+        assertEquals(expected, new HashSet<>(c));
     }
 
     @SuppressWarnings("unchecked")
@@ -153,10 +152,11 @@
     public void testIterator() {
         final MultiValueMap<K, V> map = createTestMap();
         @SuppressWarnings("unchecked")
-        Collection<V> values = new ArrayList<V>((Collection<V>) map.values());
-        Iterator<Map.Entry<K, V>> iterator = map.iterator();
+        final
+        Collection<V> values = new ArrayList<>((Collection<V>) map.values());
+        final Iterator<Map.Entry<K, V>> iterator = map.iterator();
         while (iterator.hasNext()) {
-            Map.Entry<K, V> entry = iterator.next();
+            final Map.Entry<K, V> entry = iterator.next();
             assertTrue(map.containsValue(entry.getKey(), entry.getValue()));
             assertTrue(values.contains(entry.getValue()));
             assertTrue(values.remove(entry.getValue()));
@@ -181,26 +181,26 @@
     //-----------------------------------------------------------------------
     @SuppressWarnings("unchecked")
     public void testMapEquals() {
-        final MultiValueMap<K, V> one = new MultiValueMap<K, V>();
+        final MultiValueMap<K, V> one = new MultiValueMap<>();
         final Integer value = Integer.valueOf(1);
         one.put((K) "One", value);
         one.removeMapping("One", value);
 
-        final MultiValueMap<K, V> two = new MultiValueMap<K, V>();
+        final MultiValueMap<K, V> two = new MultiValueMap<>();
         assertEquals(two, one);
     }
 
     //-----------------------------------------------------------------------
     @SuppressWarnings("unchecked")
     public void testGetCollection() {
-        final MultiValueMap<K, V> map = new MultiValueMap<K, V>();
+        final MultiValueMap<K, V> map = new MultiValueMap<>();
         map.put((K) "A", "AA");
         assertSame(map.get("A"), map.getCollection("A"));
     }
 
     @SuppressWarnings("unchecked")
     public void testTotalSize() {
-        final MultiValueMap<K, V> map = new MultiValueMap<K, V>();
+        final MultiValueMap<K, V> map = new MultiValueMap<>();
         assertEquals(0, map.totalSize());
         map.put((K) "A", "AA");
         assertEquals(1, map.totalSize());
@@ -218,7 +218,7 @@
 
     @SuppressWarnings("unchecked")
     public void testSize() {
-        final MultiValueMap<K, V> map = new MultiValueMap<K, V>();
+        final MultiValueMap<K, V> map = new MultiValueMap<>();
         assertEquals(0, map.size());
         map.put((K) "A", "AA");
         assertEquals(1, map.size());
@@ -236,7 +236,7 @@
 
     @SuppressWarnings("unchecked")
     public void testSize_Key() {
-        final MultiValueMap<K, V> map = new MultiValueMap<K, V>();
+        final MultiValueMap<K, V> map = new MultiValueMap<>();
         assertEquals(0, map.size("A"));
         assertEquals(0, map.size("B"));
         map.put((K) "A", "AA");
@@ -261,7 +261,7 @@
 
     @SuppressWarnings("unchecked")
     public void testIterator_Key() {
-        final MultiValueMap<K, V> map = new MultiValueMap<K, V>();
+        final MultiValueMap<K, V> map = new MultiValueMap<>();
         assertEquals(false, map.iterator("A").hasNext());
         map.put((K) "A", "AA");
         final Iterator<?> it = map.iterator("A");
@@ -272,7 +272,7 @@
 
     @SuppressWarnings("unchecked")
     public void testContainsValue_Key() {
-        final MultiValueMap<K, V> map = new MultiValueMap<K, V>();
+        final MultiValueMap<K, V> map = new MultiValueMap<>();
         assertEquals(false, map.containsValue("A", "AA"));
         assertEquals(false, map.containsValue("B", "BB"));
         map.put((K) "A", "AA");
@@ -305,11 +305,11 @@
 
     @SuppressWarnings("unchecked")
     public void testPutAll_Map1() {
-        final MultiMap<K, V> original = new MultiValueMap<K, V>();
+        final MultiMap<K, V> original = new MultiValueMap<>();
         original.put((K) "key", "object1");
         original.put((K) "key", "object2");
 
-        final MultiValueMap<K, V> test = new MultiValueMap<K, V>();
+        final MultiValueMap<K, V> test = new MultiValueMap<>();
         test.put((K) "keyA", "objectA");
         test.put((K) "key", "object0");
         test.putAll(original);
@@ -326,11 +326,11 @@
 
     @SuppressWarnings("unchecked")
     public void testPutAll_Map2() {
-        final Map<K, V> original = new HashMap<K, V>();
+        final Map<K, V> original = new HashMap<>();
         original.put((K) "keyX", (V) "object1");
         original.put((K) "keyY", (V) "object2");
 
-        final MultiValueMap<K, V> test = new MultiValueMap<K, V>();
+        final MultiValueMap<K, V> test = new MultiValueMap<>();
         test.put((K) "keyA", "objectA");
         test.put((K) "keyX", "object0");
         test.putAll(original);
@@ -348,7 +348,7 @@
 
     @SuppressWarnings("unchecked")
     public void testPutAll_KeyCollection() {
-        final MultiValueMap<K, V> map = new MultiValueMap<K, V>();
+        final MultiValueMap<K, V> map = new MultiValueMap<>();
         Collection<V> coll = (Collection<V>) Arrays.asList("X", "Y", "Z");
 
         assertEquals(true, map.putAll((K) "A", coll));
@@ -380,7 +380,7 @@
 
     @SuppressWarnings("unchecked")
     public void testRemove_KeyItem() {
-        final MultiValueMap<K, V> map = new MultiValueMap<K, V>();
+        final MultiValueMap<K, V> map = new MultiValueMap<>();
         map.put((K) "A", "AA");
         map.put((K) "A", "AB");
         map.put((K) "A", "AC");
@@ -393,40 +393,40 @@
     }
 
     public void testUnsafeDeSerialization() throws Exception {
-        MultiValueMap map1 = MultiValueMap.multiValueMap(new HashMap(), ArrayList.class);
+        final MultiValueMap map1 = MultiValueMap.multiValueMap(new HashMap(), ArrayList.class);
         byte[] bytes = serialize(map1);
         Object result = deserialize(bytes);
         assertEquals(map1, result);
-        
-        MultiValueMap map2 = MultiValueMap.multiValueMap(new HashMap(), (Class) String.class);
+
+        final MultiValueMap map2 = MultiValueMap.multiValueMap(new HashMap(), (Class) String.class);
         bytes = serialize(map2);
         try {
             result = deserialize(bytes);
             fail("unsafe clazz accepted when de-serializing MultiValueMap");
-        } catch (UnsupportedOperationException ex) {
+        } catch (final UnsupportedOperationException ex) {
             // expected
         }
     }
 
-    private byte[] serialize(Object object) throws IOException {
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        ObjectOutputStream oos = new ObjectOutputStream(baos);
+    private byte[] serialize(final Object object) throws IOException {
+        final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        final ObjectOutputStream oos = new ObjectOutputStream(baos);
 
         oos.writeObject(object);
         oos.close();
 
         return baos.toByteArray();
     }
-    
-    private Object deserialize(byte[] data) throws IOException, ClassNotFoundException {
-        ByteArrayInputStream bais = new ByteArrayInputStream(data);
-        ObjectInputStream iis = new ObjectInputStream(bais);
-        
+
+    private Object deserialize(final byte[] data) throws IOException, ClassNotFoundException {
+        final ByteArrayInputStream bais = new ByteArrayInputStream(data);
+        final ObjectInputStream iis = new ObjectInputStream(bais);
+
         return iis.readObject();
     }
 
     //-----------------------------------------------------------------------
-    // Manual serialization testing as this class cannot easily 
+    // Manual serialization testing as this class cannot easily
     // extend the AbstractTestMap
     //-----------------------------------------------------------------------
 
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/PassiveExpiringMapTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/PassiveExpiringMapTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/PassiveExpiringMapTest.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/PassiveExpiringMapTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -29,7 +29,6 @@
  * JUnit tests.
  *
  * @since 4.0
- * @version $Id: PassiveExpiringMapTest.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class PassiveExpiringMapTest<K, V> extends AbstractMapTest<K, V> {
 
@@ -38,6 +37,7 @@
 
         private static final long serialVersionUID = 1L;
 
+        @Override
         public long expirationTime(final Integer key, final String value) {
             // odd keys expire immediately, even keys never expire
             if (key == null) {
@@ -74,24 +74,24 @@
     }
 
     private Map<Integer, String> makeDecoratedTestMap() {
-        final Map<Integer, String> m = new HashMap<Integer, String>();
+        final Map<Integer, String> m = new HashMap<>();
         m.put(Integer.valueOf(1), "one");
         m.put(Integer.valueOf(2), "two");
         m.put(Integer.valueOf(3), "three");
         m.put(Integer.valueOf(4), "four");
         m.put(Integer.valueOf(5), "five");
         m.put(Integer.valueOf(6), "six");
-        return new PassiveExpiringMap<Integer, String>(new TestExpirationPolicy(), m);
+        return new PassiveExpiringMap<>(new TestExpirationPolicy(), m);
     }
 
     @Override
     public Map<K, V> makeObject() {
-        return new PassiveExpiringMap<K, V>();
+        return new PassiveExpiringMap<>();
     }
 
     private Map<Integer, String> makeTestMap() {
         final Map<Integer, String> m =
-                new PassiveExpiringMap<Integer, String>(new TestExpirationPolicy());
+                new PassiveExpiringMap<>(new TestExpirationPolicy());
         m.put(Integer.valueOf(1), "one");
         m.put(Integer.valueOf(2), "two");
         m.put(Integer.valueOf(3), "three");
@@ -104,7 +104,7 @@
     public void testConstructors() {
         try {
             final Map<String, String> map = null;
-            new PassiveExpiringMap<String, String>(map);
+            new PassiveExpiringMap<>(map);
             fail("constructor - exception should have been thrown.");
         } catch (final NullPointerException ex) {
             // success
@@ -112,7 +112,7 @@
 
         try {
             final ExpirationPolicy<String, String> policy = null;
-            new PassiveExpiringMap<String, String>(policy);
+            new PassiveExpiringMap<>(policy);
             fail("constructor - exception should have been thrown.");
         } catch (final NullPointerException ex) {
             // success
@@ -220,32 +220,32 @@
 
     public void testZeroTimeToLive() {
         // item should not be available
-        final PassiveExpiringMap<String, String> m = new PassiveExpiringMap<String, String>(0L);
+        final PassiveExpiringMap<String, String> m = new PassiveExpiringMap<>(0L);
         m.put("a", "b");
         assertNull(m.get("a"));
     }
-    
+
     public void testExpiration() {
         validateExpiration(new PassiveExpiringMap<String, String>(500), 500);
         validateExpiration(new PassiveExpiringMap<String, String>(1000), 1000);
-        validateExpiration(new PassiveExpiringMap<String, String>(
+        validateExpiration(new PassiveExpiringMap<>(
                 new PassiveExpiringMap.ConstantTimeToLiveExpirationPolicy<String, String>(500)), 500);
-        validateExpiration(new PassiveExpiringMap<String, String>(
+        validateExpiration(new PassiveExpiringMap<>(
                 new PassiveExpiringMap.ConstantTimeToLiveExpirationPolicy<String, String>(1, TimeUnit.SECONDS)), 1000);
     }
 
-    private void validateExpiration(final Map<String, String> map, long timeout) {
+    private void validateExpiration(final Map<String, String> map, final long timeout) {
         map.put("a", "b");
-        
+
         assertNotNull(map.get("a"));
-        
+
         try {
             Thread.sleep(2 * timeout);
-        } catch (InterruptedException e) {
+        } catch (final InterruptedException e) {
             fail();
         }
 
         assertNull(map.get("a"));
     }
-    
+
 }
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/PredicatedMapTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/PredicatedMapTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/PredicatedMapTest.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/PredicatedMapTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -25,17 +25,17 @@
 import org.apache.commons.collections4.functors.TruePredicate;
 
 /**
- * Extension of {@link AbstractMapTest} for exercising the 
+ * Extension of {@link AbstractMapTest} for exercising the
  * {@link PredicatedMap} implementation.
  *
  * @since 3.0
- * @version $Id: PredicatedMapTest.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 public class PredicatedMapTest<K, V> extends AbstractIterableMapTest<K, V> {
 
     protected static final Predicate<Object> truePredicate = TruePredicate.<Object>truePredicate();
 
     protected static final Predicate<Object> testPredicate = new Predicate<Object>() {
+        @Override
         public boolean evaluate(final Object o) {
             return o instanceof String;
         }
@@ -93,7 +93,7 @@
         assertTrue(!map.containsKey(Integer.valueOf(3)));
         assertTrue(!map.containsValue(Integer.valueOf(3)));
 
-        final Map<K, V> map2 = new HashMap<K, V>();
+        final Map<K, V> map2 = new HashMap<>();
         map2.put((K) "A", (V) "a");
         map2.put((K) "B", (V) "b");
         map2.put((K) "C", (V) "c");
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/PredicatedSortedMapTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/PredicatedSortedMapTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/PredicatedSortedMapTest.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/PredicatedSortedMapTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -31,13 +31,13 @@
  * {@link PredicatedSortedMap} implementation.
  *
  * @since 3.0
- * @version $Id: PredicatedSortedMapTest.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 public class PredicatedSortedMapTest<K, V> extends AbstractSortedMapTest<K, V> {
 
     protected static final Predicate<Object> truePredicate = TruePredicate.truePredicate();
 
     protected static final Predicate<Object> testPredicate = new Predicate<Object>() {
+        @Override
         public boolean evaluate(final Object o) {
             return o instanceof String;
         }
@@ -107,7 +107,7 @@
         assertTrue(!map.containsKey(Integer.valueOf(3)));
         assertTrue(!map.containsValue(Integer.valueOf(3)));
 
-        final Map<K, V> map2 = new HashMap<K, V>();
+        final Map<K, V> map2 = new HashMap<>();
         map2.put((K) "A", (V) "a");
         map2.put((K) "B", (V) "b");
         map2.put((K) "C", (V) "c");
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/ReferenceIdentityMapTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/ReferenceIdentityMapTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/ReferenceIdentityMapTest.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/ReferenceIdentityMapTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -29,7 +29,6 @@
 /**
  * Tests for ReferenceIdentityMap.
  *
- * @version $Id: ReferenceIdentityMapTest.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 public class ReferenceIdentityMapTest<K, V> extends AbstractIterableMapTest<K, V> {
 
@@ -48,7 +47,7 @@
 
     @Override
     public ReferenceIdentityMap<K, V> makeObject() {
-        return new ReferenceIdentityMap<K, V>(ReferenceStrength.WEAK, ReferenceStrength.WEAK);
+        return new ReferenceIdentityMap<>(ReferenceStrength.WEAK, ReferenceStrength.WEAK);
     }
 
     @Override
@@ -56,7 +55,7 @@
         // Testing against another [collections] class generally isn't a good idea,
         // but the closest alternative is IdentityHashMap, which propagates reference-equality down to keySet and values.
         // arguably ReferenceIdentityMap should do the same but that's a later discussion.
-        return new IdentityMap<K, V>();
+        return new IdentityMap<>();
     }
 
     @Override
@@ -88,7 +87,7 @@
     //-----------------------------------------------------------------------
     @SuppressWarnings("unchecked")
     public void testBasics() {
-        final IterableMap<K, V> map = new ReferenceIdentityMap<K, V>(ReferenceStrength.HARD, ReferenceStrength.HARD);
+        final IterableMap<K, V> map = new ReferenceIdentityMap<>(ReferenceStrength.HARD, ReferenceStrength.HARD);
         assertEquals(0, map.size());
 
         map.put((K) I1A, (V) I2A);
@@ -122,7 +121,7 @@
     //-----------------------------------------------------------------------
     @SuppressWarnings("unchecked")
     public void testHashEntry() {
-        final IterableMap<K, V> map = new ReferenceIdentityMap<K, V>(ReferenceStrength.HARD, ReferenceStrength.HARD);
+        final IterableMap<K, V> map = new ReferenceIdentityMap<>(ReferenceStrength.HARD, ReferenceStrength.HARD);
 
         map.put((K) I1A, (V) I2A);
         map.put((K) I1B, (V) I2A);
@@ -281,10 +280,10 @@
         final K key = (K) new Object();
         final V value = (V) new Object();
 
-        keyReference = new WeakReference<K>(key);
-        valueReference = new WeakReference<V>(value);
+        keyReference = new WeakReference<>(key);
+        valueReference = new WeakReference<>(value);
 
-        final Map<K, V> testMap = new ReferenceIdentityMap<K, V>(ReferenceStrength.WEAK, ReferenceStrength.HARD, true);
+        final Map<K, V> testMap = new ReferenceIdentityMap<>(ReferenceStrength.WEAK, ReferenceStrength.HARD, true);
         testMap.put(key, value);
 
         assertEquals("In map", value, testMap.get(key));
@@ -311,12 +310,11 @@
                 valueReference.get() == null) {
                 break;
 
-            } else {
-                // create garbage:
-                @SuppressWarnings("unused")
-                final byte[] b =  new byte[bytz];
-                bytz = bytz * 2;
             }
+            // create garbage:
+            @SuppressWarnings("unused")
+            final byte[] b =  new byte[bytz];
+            bytz = bytz * 2;
         }
     }
 
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/ReferenceMapTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/ReferenceMapTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/ReferenceMapTest.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/ReferenceMapTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -16,6 +16,12 @@
  */
 package org.apache.commons.collections4.map;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+
 import java.lang.ref.WeakReference;
 import java.util.Map;
 
@@ -27,7 +33,6 @@
 /**
  * Tests for ReferenceMap.
  *
- * @version $Id: ReferenceMapTest.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 public class ReferenceMapTest<K, V> extends AbstractIterableMapTest<K, V> {
 
@@ -41,7 +46,7 @@
 
     @Override
     public ReferenceMap<K, V> makeObject() {
-        return new ReferenceMap<K, V>(ReferenceStrength.WEAK, ReferenceStrength.WEAK);
+        return new ReferenceMap<>(ReferenceStrength.WEAK, ReferenceStrength.WEAK);
     }
 
     @Override
@@ -214,10 +219,10 @@
         final K key = (K) new Object();
         final V value = (V) new Object();
 
-        keyReference = new WeakReference<K>(key);
-        valueReference = new WeakReference<V>(value);
+        keyReference = new WeakReference<>(key);
+        valueReference = new WeakReference<>(value);
 
-        final Map<K, V> testMap = new ReferenceMap<K, V>(ReferenceStrength.WEAK, ReferenceStrength.HARD, true);
+        final Map<K, V> testMap = new ReferenceMap<>(ReferenceStrength.WEAK, ReferenceStrength.HARD, true);
         testMap.put(key, value);
 
         assertEquals("In map", value, testMap.get(key));
@@ -242,15 +247,40 @@
             if (keyReference.get() == null && valueReference.get() == null) {
                 break;
 
-            } else {
-                // create garbage:
-                @SuppressWarnings("unused")
-                final byte[] b = new byte[bytz];
-                bytz = bytz * 2;
             }
+            // create garbage:
+            @SuppressWarnings("unused")
+            final byte[] b = new byte[bytz];
+            bytz = bytz * 2;
         }
     }
 
+    /**
+     * Test whether after serialization the "data" HashEntry array is the same size as the original.<p>
+     *
+     * See <a href="https://issues.apache.org/jira/browse/COLLECTIONS-599">COLLECTIONS-599: HashEntry array object naming data initialized with double the size during deserialization</a>
+     */
+    public void testDataSizeAfterSerialization() throws IOException, ClassNotFoundException {
+
+        final ReferenceMap<String,String> serialiseMap = new ReferenceMap<>(ReferenceStrength.WEAK, ReferenceStrength.WEAK, true);
+        serialiseMap.put("KEY", "VALUE");
+
+        final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        try (ObjectOutputStream out = new ObjectOutputStream(baos)) {
+            out.writeObject(serialiseMap);
+        }
+
+        final ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
+        try (ObjectInputStream in = new ObjectInputStream(bais)) {
+            @SuppressWarnings("unchecked")
+            final
+            ReferenceMap<String,String> deserialisedMap = (ReferenceMap<String,String>) in.readObject();
+            assertEquals(1, deserialisedMap.size());
+            assertEquals(serialiseMap.data.length, deserialisedMap.data.length);
+        }
+
+    }
+
     @SuppressWarnings("unused")
     private static void gc() {
         try {
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/SingletonMapTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/SingletonMapTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/SingletonMapTest.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/SingletonMapTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -27,7 +27,6 @@
 /**
  * JUnit tests.
  *
- * @version $Id: SingletonMapTest.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 public class SingletonMapTest<K, V> extends AbstractOrderedMapTest<K, V> {
 
@@ -64,7 +63,7 @@
     @Override
     @SuppressWarnings("unchecked")
     public SingletonMap<K, V> makeFullMap() {
-        return new SingletonMap<K, V>((K) ONE, (V) TWO);
+        return new SingletonMap<>((K) ONE, (V) TWO);
     }
 
     @Override
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/StaticBucketMapTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/StaticBucketMapTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/StaticBucketMapTest.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/StaticBucketMapTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -24,7 +24,6 @@
  * Unit tests.
  * {@link StaticBucketMap}.
  *
- * @version $Id: StaticBucketMapTest.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 public class StaticBucketMapTest<K, V> extends AbstractIterableMapTest<K, V> {
 
@@ -38,7 +37,7 @@
 
     @Override
     public StaticBucketMap<K, V> makeObject() {
-        return new StaticBucketMap<K, V>(30);
+        return new StaticBucketMap<>(30);
     }
 
     /**
@@ -63,7 +62,7 @@
     // Bugzilla 37567
     @SuppressWarnings("unchecked")
     public void test_get_nullMatchesIncorrectly() {
-        final StaticBucketMap<K, V> map = new StaticBucketMap<K, V>(17);
+        final StaticBucketMap<K, V> map = new StaticBucketMap<>(17);
         map.put(null, (V) "A");
         assertEquals("A", map.get(null));
         // loop so we find a string that is in the same bucket as the null
@@ -75,7 +74,7 @@
 
     @SuppressWarnings("unchecked")
     public void test_containsKey_nullMatchesIncorrectly() {
-        final StaticBucketMap<K, V> map = new StaticBucketMap<K, V>(17);
+        final StaticBucketMap<K, V> map = new StaticBucketMap<>(17);
         map.put(null, (V) "A");
         assertEquals(true, map.containsKey(null));
         // loop so we find a string that is in the same bucket as the null
@@ -87,7 +86,7 @@
 
     @SuppressWarnings("unchecked")
     public void test_containsValue_nullMatchesIncorrectly() {
-        final StaticBucketMap<K, V> map = new StaticBucketMap<K, V>(17);
+        final StaticBucketMap<K, V> map = new StaticBucketMap<>(17);
         map.put((K) "A", null);
         assertEquals(true, map.containsValue(null));
         // loop so we find a string that is in the same bucket as the null
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/TransformedMapTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/TransformedMapTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/TransformedMapTest.java	2015-11-23 21:42:01.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/TransformedMapTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -30,7 +30,6 @@
  * implementation.
  *
  * @since 3.0
- * @version $Id: TransformedMapTest.java 1715973 2015-11-23 21:42:01Z tn $
  */
 public class TransformedMapTest<K, V> extends AbstractIterableMapTest<K, V> {
 
@@ -98,7 +97,7 @@
     //-----------------------------------------------------------------------
     @SuppressWarnings("unchecked")
     public void testFactory_Decorate() {
-        final Map<K, V> base = new HashMap<K, V>();
+        final Map<K, V> base = new HashMap<>();
         base.put((K) "A", (V) "1");
         base.put((K) "B", (V) "2");
         base.put((K) "C", (V) "3");
@@ -118,7 +117,7 @@
 
     @SuppressWarnings("unchecked")
     public void testFactory_decorateTransform() {
-        final Map<K, V> base = new HashMap<K, V>();
+        final Map<K, V> base = new HashMap<>();
         base.put((K) "A", (V) "1");
         base.put((K) "B", (V) "2");
         base.put((K) "C", (V) "3");
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/TransformedSortedMapTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/TransformedSortedMapTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/TransformedSortedMapTest.java	2013-11-14 20:57:02.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/TransformedSortedMapTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -33,7 +33,6 @@
  * implementation.
  *
  * @since 3.0
- * @version $Id: TransformedSortedMapTest.java 1542074 2013-11-14 20:57:02Z tn $
  */
 public class TransformedSortedMapTest<K, V> extends AbstractSortedMapTest<K, V> {
 
@@ -58,14 +57,13 @@
                     preTailMap + "bulkTestMapEntrySet.testCollectionIteratorRemove",
                     preTailMap + "bulkTestMapEntrySet.testCollectionRemoveAll",
                     preTailMap + "bulkTestMapKeySet.testCollectionIteratorRemove",
-                    preTailMap + "bulkTestMapKeySet.testCollectionRemoveAll",                    
+                    preTailMap + "bulkTestMapKeySet.testCollectionRemoveAll",
                     preTailMap + "bulkTestMapValues.testCollectionClear",
                     preTailMap + "bulkTestMapValues.testCollectionRemoveAll",
                     preTailMap + "bulkTestMapValues.testCollectionRetainAll"
             };
-        } else {
-            return null;
         }
+        return null;
     }
 
     //-----------------------------------------------------------------------
@@ -144,7 +142,7 @@
     //-----------------------------------------------------------------------
     @SuppressWarnings("unchecked")
     public void testFactory_Decorate() {
-        final SortedMap<K, V> base = new TreeMap<K, V>();
+        final SortedMap<K, V> base = new TreeMap<>();
         base.put((K) "A", (V) "1");
         base.put((K) "B", (V) "2");
         base.put((K) "C", (V) "3");
@@ -164,7 +162,7 @@
 
     @SuppressWarnings("unchecked")
     public void testFactory_decorateTransform() {
-        final SortedMap<K, V> base = new TreeMap<K, V>();
+        final SortedMap<K, V> base = new TreeMap<>();
         base.put((K) "A", (V) "1");
         base.put((K) "B", (V) "2");
         base.put((K) "C", (V) "3");
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/UnmodifiableMapTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/UnmodifiableMapTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/UnmodifiableMapTest.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/UnmodifiableMapTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -27,7 +27,6 @@
  * {@link UnmodifiableMap} implementation.
  *
  * @since 3.0
- * @version $Id: UnmodifiableMapTest.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class UnmodifiableMapTest<K, V> extends AbstractIterableMapTest<K, V> {
 
@@ -59,7 +58,7 @@
 
     @Override
     public IterableMap<K, V> makeFullMap() {
-        final Map<K, V> m = new HashMap<K, V>();
+        final Map<K, V> m = new HashMap<>();
         addSampleMappings(m);
         return (IterableMap<K, V>) UnmodifiableMap.unmodifiableMap(m);
     }
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/UnmodifiableOrderedMapTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/UnmodifiableOrderedMapTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/UnmodifiableOrderedMapTest.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/UnmodifiableOrderedMapTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -26,7 +26,6 @@
  * {@link UnmodifiableOrderedMap} implementation.
  *
  * @since 3.0
- * @version $Id: UnmodifiableOrderedMapTest.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class UnmodifiableOrderedMapTest<K, V> extends AbstractOrderedMapTest<K, V> {
 
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/UnmodifiableSortedMapTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/UnmodifiableSortedMapTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/map/UnmodifiableSortedMapTest.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/map/UnmodifiableSortedMapTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -26,7 +26,6 @@
  * {@link UnmodifiableSortedMap} implementation.
  *
  * @since 3.0
- * @version $Id: UnmodifiableSortedMapTest.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class UnmodifiableSortedMapTest<K, V> extends AbstractSortedMapTest<K, V> {
 
@@ -58,7 +57,7 @@
 
     @Override
     public SortedMap<K, V> makeFullMap() {
-        final SortedMap<K, V> m = new TreeMap<K, V>();
+        final SortedMap<K, V> m = new TreeMap<>();
         addSampleMappings(m);
         return UnmodifiableSortedMap.unmodifiableSortedMap(m);
     }
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/MapPerformance.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/MapPerformance.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/MapPerformance.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/MapPerformance.java	2018-07-08 00:18:18.000000000 +0000
@@ -26,7 +26,6 @@
 /**
  * <code>MapPerformanceTest</code> is designed to perform basic Map performance tests.
  *
- * @version $Id: MapPerformance.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 public class MapPerformance {
 
@@ -41,13 +40,13 @@
     }
 
     private static void testAll() {
-        final Map<String, String> dummyMap = new DummyMap<String, String>();
-        final Map<String, String> hashMap = new HashMap<String, String>();
+        final Map<String, String> dummyMap = new DummyMap<>();
+        final Map<String, String> hashMap = new HashMap<>();
 //        hashMap.put("Alpha", "A");
 //        hashMap.put("Beta", "B");
 //        hashMap.put("Gamma", "C");
 //        hashMap.put("Delta", "D");
-        final Map<String, String> flatMap = new Flat3Map<String, String>(hashMap);
+        final Map<String, String> flatMap = new Flat3Map<>(hashMap);
         System.out.println(flatMap);
 //        Map<String, String> unmodHashMap = Collections.unmodifiableMap(new HashMap<String, String>(hashMap));
 //        Map fastHashMap = new FastHashMap(hashMap);
@@ -132,37 +131,49 @@
     // ----------------------------------------------------------------------
 
     private static class DummyMap<K, V> implements Map<K, V> {
+        @Override
         public void clear() {
         }
+        @Override
         public boolean containsKey(final Object key) {
             return false;
         }
+        @Override
         public boolean containsValue(final Object value) {
             return false;
         }
+        @Override
         public Set<Map.Entry<K, V>> entrySet() {
             return null;
         }
+        @Override
         public V get(final Object key) {
             return null;
         }
+        @Override
         public boolean isEmpty() {
             return false;
         }
+        @Override
         public Set<K> keySet() {
             return null;
         }
+        @Override
         public V put(final K key, final V value) {
             return null;
         }
+        @Override
         public void putAll(final Map<? extends K, ? extends V> t) {
         }
+        @Override
         public V remove(final Object key) {
             return null;
         }
+        @Override
         public int size() {
             return 0;
         }
+        @Override
         public Collection<V> values() {
             return null;
         }
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/MapUtilsTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/MapUtilsTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/MapUtilsTest.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/MapUtilsTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -16,10 +16,16 @@
  */
 package org.apache.commons.collections4;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -27,12 +33,15 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.ListResourceBundle;
+import java.util.Locale;
 import java.util.Map;
+import java.util.Properties;
 import java.util.ResourceBundle;
 import java.util.Set;
 import java.util.TreeMap;
 
 import org.apache.commons.collections4.collection.TransformedCollectionTest;
+import org.apache.commons.collections4.junit.AbstractAvailableLocalesTest;
 import org.apache.commons.collections4.keyvalue.DefaultKeyValue;
 import org.apache.commons.collections4.keyvalue.DefaultMapEntry;
 import org.apache.commons.collections4.map.HashedMap;
@@ -44,13 +53,17 @@
 /**
  * Tests for MapUtils.
  *
- * @version $Id: MapUtilsTest.java 1686855 2015-06-22 13:00:27Z tn $
  */
 @SuppressWarnings("boxing")
-public class MapUtilsTest {
+public class MapUtilsTest extends AbstractAvailableLocalesTest {
+
+    public MapUtilsTest(final Locale locale) {
+        super(locale);
+    }
 
     public Predicate<Object> getPredicate() {
         return new Predicate<Object>() {
+            @Override
             public boolean evaluate(final Object o) {
                 return o instanceof String;
             }
@@ -60,7 +73,7 @@
     @Test
     public void testPredicatedMap() {
         final Predicate<Object> p = getPredicate();
-        Map<Object, Object> map = MapUtils.predicatedMap(new HashMap<Object, Object>(), p, p);
+        final Map<Object, Object> map = MapUtils.predicatedMap(new HashMap<>(), p, p);
         assertTrue("returned object should be a PredicatedMap", map instanceof PredicatedMap);
         try {
             MapUtils.predicatedMap(null, p, p);
@@ -73,10 +86,10 @@
     @Test
     public void testLazyMapFactory() {
         final Factory<Integer> factory = FactoryUtils.constantFactory(Integer.valueOf(5));
-        Map<Object, Object> map = MapUtils.lazyMap(new HashMap<Object, Object>(), factory);
+        Map<Object, Object> map = MapUtils.lazyMap(new HashMap<>(), factory);
         assertTrue(map instanceof LazyMap);
         try {
-            map = MapUtils.lazyMap(new HashMap<Object, Object>(), (Factory<Object>) null);
+            map = MapUtils.lazyMap(new HashMap<>(), (Factory<Object>) null);
             fail("Expecting NullPointerException for null factory");
         } catch (final NullPointerException e) {
             // expected
@@ -88,10 +101,10 @@
             // expected
         }
         final Transformer<Object, Integer> transformer = TransformerUtils.asTransformer(factory);
-        map = MapUtils.lazyMap(new HashMap<Object, Object>(), transformer);
+        map = MapUtils.lazyMap(new HashMap<>(), transformer);
         assertTrue(map instanceof LazyMap);
         try {
-            map = MapUtils.lazyMap(new HashMap<Object, Object>(), (Transformer<Object, Object>) null);
+            map = MapUtils.lazyMap(new HashMap<>(), (Transformer<Object, Object>) null);
             fail("Expecting NullPointerException for null transformer");
         } catch (final NullPointerException e) {
             // expected
@@ -106,7 +119,8 @@
 
     @Test
     public void testLazyMapTransformer() {
-        final Map<Object, Object> map = MapUtils.lazyMap(new HashMap<Object, Object>(), new Transformer<Object, Object>() {
+        final Map<Object, Object> map = MapUtils.lazyMap(new HashMap<>(), new Transformer<Object, Object>() {
+            @Override
             public Object transform(final Object mapKey) {
                 if (mapKey instanceof String) {
                     return Integer.valueOf((String) mapKey);
@@ -127,20 +141,20 @@
 
     @Test
     public void testInvertMap() {
-        final Map<String, String> in = new HashMap<String, String>(5, 1);
+        final Map<String, String> in = new HashMap<>(5, 1);
         in.put("1", "A");
         in.put("2", "B");
         in.put("3", "C");
         in.put("4", "D");
         in.put("5", "E");
 
-        final Set<String> inKeySet = new HashSet<String>(in.keySet());
-        final Set<String> inValSet = new HashSet<String>(in.values());
+        final Set<String> inKeySet = new HashSet<>(in.keySet());
+        final Set<String> inValSet = new HashSet<>(in.values());
 
         final Map<String, String> out =  MapUtils.invertMap(in);
 
-        final Set<String> outKeySet = new HashSet<String>(out.keySet());
-        final Set<String> outValSet = new HashSet<String>(out.values());
+        final Set<String> outKeySet = new HashSet<>(out.keySet());
+        final Set<String> outValSet = new HashSet<>(out.values());
 
         assertTrue( inKeySet.equals( outValSet ));
         assertTrue( inValSet.equals( outKeySet ));
@@ -235,11 +249,14 @@
         assertEquals("#0000FF", test.get("BLUE"));
         assertEquals(3, test.size());
 
+        test = MapUtils.putAll(new HashMap<String, String>(), null);
+        assertEquals(0, test.size());
+
         // map entry
         test = MapUtils.putAll(new HashMap<String, String>(), new Object[] {
-            new DefaultMapEntry<String, String>("RED", "#FF0000"),
-            new DefaultMapEntry<String, String>("GREEN", "#00FF00"),
-            new DefaultMapEntry<String, String>("BLUE", "#0000FF")
+            new DefaultMapEntry<>("RED", "#FF0000"),
+            new DefaultMapEntry<>("GREEN", "#00FF00"),
+            new DefaultMapEntry<>("BLUE", "#0000FF")
         });
         assertEquals(true, test.containsKey("RED"));
         assertEquals("#FF0000", test.get("RED"));
@@ -251,9 +268,9 @@
 
         // key value
         test = MapUtils.putAll(new HashMap<String, String>(), new Object[] {
-            new DefaultKeyValue<String, String>("RED", "#FF0000"),
-            new DefaultKeyValue<String, String>("GREEN", "#00FF00"),
-            new DefaultKeyValue<String, String>("BLUE", "#0000FF")
+            new DefaultKeyValue<>("RED", "#FF0000"),
+            new DefaultKeyValue<>("GREEN", "#00FF00"),
+            new DefaultKeyValue<>("BLUE", "#0000FF")
         });
         assertEquals(true, test.containsKey("RED"));
         assertEquals("#FF0000", test.get("RED"));
@@ -266,7 +283,7 @@
 
     @Test
     public void testConvertResourceBundle() {
-        final Map<String, String> in = new HashMap<String, String>( 5 , 1 );
+        final Map<String, String> in = new HashMap<>( 5 , 1 );
         in.put("1", "A");
         in.put("2", "B");
         in.put("3", "C");
@@ -297,11 +314,11 @@
 
     @Test
     public void testDebugAndVerbosePrintCasting() {
-        final Map<Integer, String> inner = new HashMap<Integer, String>(2, 1);
+        final Map<Integer, String> inner = new HashMap<>(2, 1);
         inner.put(2, "B");
         inner.put(3, "C");
 
-        final Map<Integer, Object> outer = new HashMap<Integer, Object>(2, 1);
+        final Map<Integer, Object> outer = new HashMap<>(2, 1);
         outer.put(0, inner);
         outer.put(1, "A");
 
@@ -342,7 +359,7 @@
 
         final String INDENT = "    ";
 
-        final Map<Integer, String> map = new TreeMap<Integer, String>();  // treeMap guarantees order across JDKs for test
+        final Map<Integer, String> map = new TreeMap<>();  // treeMap guarantees order across JDKs for test
         map.put(2, "B");
         map.put(3, "C");
         map.put(4, null);
@@ -366,7 +383,7 @@
 
         final String INDENT = "    ";
 
-        final Map<Integer, String> map = new TreeMap<Integer, String>();  // treeMap guarantees order across JDKs for test
+        final Map<Integer, String> map = new TreeMap<>();  // treeMap guarantees order across JDKs for test
         map.put(2, "B");
         map.put(3, "C");
         map.put(4, null);
@@ -412,7 +429,7 @@
     @Test
     public void testVerbosePrintNullStream() {
         try {
-            MapUtils.verbosePrint(null, "Map", new HashMap<Object, Object>());
+            MapUtils.verbosePrint(null, "Map", new HashMap<>());
             fail("Should generate NullPointerException");
         } catch (final NullPointerException expected) {
         }
@@ -421,7 +438,7 @@
     @Test
     public void testDebugPrintNullStream() {
         try {
-            MapUtils.debugPrint(null, "Map", new HashMap<Object, Object>());
+            MapUtils.debugPrint(null, "Map", new HashMap<>());
             fail("Should generate NullPointerException");
         } catch (final NullPointerException expected) {
         }
@@ -434,7 +451,7 @@
 
         final String INDENT = "    ";
 
-        final Map<Object, String> map = new HashMap<Object, String>();
+        final Map<Object, String> map = new HashMap<>();
         map.put(null, "A");
 
         outPrint.println("{");
@@ -454,7 +471,7 @@
 
         final String INDENT = "    ";
 
-        final Map<Object, String> map = new HashMap<Object, String>();
+        final Map<Object, String> map = new HashMap<>();
         map.put(null, "A");
 
         outPrint.println("{");
@@ -474,7 +491,7 @@
 
         final String INDENT = "    ";
 
-        final Map<Object, Map<?, ?>> map = new HashMap<Object, Map<?, ?>>();
+        final Map<Object, Map<?, ?>> map = new HashMap<>();
         map.put(null, map);
 
         outPrint.println("{");
@@ -494,7 +511,7 @@
 
         final String INDENT = "    ";
 
-        final Map<Object, Map<?, ?>> map = new HashMap<Object, Map<?, ?>>();
+        final Map<Object, Map<?, ?>> map = new HashMap<>();
         map.put(null, map);
 
         outPrint.println("{");
@@ -514,8 +531,8 @@
 
         final String INDENT = "    ";
 
-        final Map<Object, Object> map = new HashMap<Object, Object>();
-        final Map<Object, Object> map2= new HashMap<Object, Object>();
+        final Map<Object, Object> map = new HashMap<>();
+        final Map<Object, Object> map2= new HashMap<>();
         map.put(null, map2);
         map2.put("2", "B");
 
@@ -539,8 +556,8 @@
 
         final String INDENT = "    ";
 
-        final Map<Object, Object> map = new HashMap<Object, Object>();
-        final Map<Object, Object> map2= new HashMap<Object, Object>();
+        final Map<Object, Object> map = new HashMap<>();
+        final Map<Object, Object> map2= new HashMap<>();
         map.put(null, map2);
         map2.put("2", "B");
 
@@ -580,11 +597,11 @@
 
         out.reset();
 
-        final Map<Integer, String> inner = new TreeMap<Integer, String>();  // treeMap guarantees order across JDKs for test
+        final Map<Integer, String> inner = new TreeMap<>();  // treeMap guarantees order across JDKs for test
         inner.put(2, "B");
         inner.put(3, "C");
 
-        final Map<Integer, Object> outer = new TreeMap<Integer, Object>();
+        final Map<Integer, Object> outer = new TreeMap<>();
         outer.put(1, inner);
         outer.put(0, "A");
         outer.put(7, outer);
@@ -616,11 +633,11 @@
 
         out.reset();
 
-        final Map<Integer, String> inner = new TreeMap<Integer, String>();  // treeMap guarantees order across JDKs for test
+        final Map<Integer, String> inner = new TreeMap<>();  // treeMap guarantees order across JDKs for test
         inner.put(2, "B");
         inner.put(3, "C");
 
-        final Map<Integer, Object> outer = new TreeMap<Integer, Object>();
+        final Map<Integer, Object> outer = new TreeMap<>();
         outer.put(1, inner);
         outer.put(0, "A");
         outer.put(7, outer);
@@ -637,9 +654,9 @@
         final String LABEL = "Print Map";
         final String INDENT = "    ";
 
-        final Map<Integer, Object> grandfather = new TreeMap<Integer, Object>();// treeMap guarantees order across JDKs for test
-        final Map<Integer, Object> father = new TreeMap<Integer, Object>();
-        final Map<Integer, Object> son    = new TreeMap<Integer, Object>();
+        final Map<Integer, Object> grandfather = new TreeMap<>();// treeMap guarantees order across JDKs for test
+        final Map<Integer, Object> father = new TreeMap<>();
+        final Map<Integer, Object> son    = new TreeMap<>();
 
         grandfather.put(0, "A");
         grandfather.put(1, father);
@@ -684,9 +701,9 @@
         final String LABEL = "Print Map";
         final String INDENT = "    ";
 
-        final Map<Integer, Object> grandfather = new TreeMap<Integer, Object>();// treeMap guarantees order across JDKs for test
-        final Map<Integer, Object> father = new TreeMap<Integer, Object>();
-        final Map<Integer, Object> son    = new TreeMap<Integer, Object>();
+        final Map<Integer, Object> grandfather = new TreeMap<>();// treeMap guarantees order across JDKs for test
+        final Map<Integer, Object> father = new TreeMap<>();
+        final Map<Integer, Object> son    = new TreeMap<>();
 
         grandfather.put(0, "A");
         grandfather.put(1, father);
@@ -729,19 +746,19 @@
     public void testEmptyIfNull() {
         assertTrue(MapUtils.emptyIfNull(null).isEmpty());
 
-        final Map<Long, Long> map = new HashMap<Long, Long>();
+        final Map<Long, Long> map = new HashMap<>();
         assertSame(map, MapUtils.emptyIfNull(map));
     }
 
     @Test
     public void testIsEmptyWithEmptyMap() {
-        final Map<Object, Object> map = new HashMap<Object, Object>();
+        final Map<Object, Object> map = new HashMap<>();
         assertEquals(true, MapUtils.isEmpty(map));
     }
 
     @Test
     public void testIsEmptyWithNonEmptyMap() {
-        final Map<String, String> map = new HashMap<String, String>();
+        final Map<String, String> map = new HashMap<>();
         map.put("item", "value");
         assertEquals(false, MapUtils.isEmpty(map));
     }
@@ -754,13 +771,13 @@
 
     @Test
     public void testIsNotEmptyWithEmptyMap() {
-        final Map<Object, Object> map = new HashMap<Object, Object>();
+        final Map<Object, Object> map = new HashMap<>();
         assertEquals(false, MapUtils.isNotEmpty(map));
     }
 
     @Test
     public void testIsNotEmptyWithNonEmptyMap() {
-        final Map<String, String> map = new HashMap<String, String>();
+        final Map<String, String> map = new HashMap<>();
         map.put("item", "value");
         assertEquals(true, MapUtils.isNotEmpty(map));
     }
@@ -774,7 +791,7 @@
     @Test
     public void testPopulateMap() {
         // Setup Test Data
-        final List<String> list = new ArrayList<String>();
+        final List<String> list = new ArrayList<>();
         list.add("1");
         list.add("3");
         list.add("5");
@@ -784,7 +801,7 @@
         list.add("6");
 
         // Now test key transform population
-        Map<Object, Object> map = new HashMap<Object, Object>();
+        Map<Object, Object> map = new HashMap<>();
         MapUtils.populateMap(map, list, TransformedCollectionTest.STRING_TO_INTEGER_TRANSFORMER);
         assertEquals(list.size(), map.size());
 
@@ -796,7 +813,7 @@
         }
 
         // Now test both Key-Value transform population
-        map = new HashMap<Object, Object>();
+        map = new HashMap<>();
         MapUtils.populateMap(map, list, TransformedCollectionTest.STRING_TO_INTEGER_TRANSFORMER, TransformedCollectionTest.STRING_TO_INTEGER_TRANSFORMER);
 
         assertEquals(list.size(), map.size());
@@ -815,12 +832,13 @@
         int key;
         String name;
 
-        public X(int key, String name) {
+        public X(final int key, final String name) {
             this.key = key;
             this.name = name;
         }
 
-        public int compareTo(X o) {
+        @Override
+        public int compareTo(final X o) {
             return key - o.key | name.compareTo(o.name);
         }
 
@@ -829,7 +847,7 @@
     @Test
     public void testPopulateMultiMap() {
         // Setup Test Data
-        final List<X> list = new ArrayList<X>();
+        final List<X> list = new ArrayList<>();
         list.add(new X(1, "x1"));
         list.add(new X(2, "x2"));
         list.add(new X(2, "x3"));
@@ -839,7 +857,8 @@
         // Now test key transform population
         final MultiValueMap<Integer, X> map = MultiValueMap.multiValueMap(new TreeMap<Integer, Collection<X>>());
         MapUtils.populateMap(map, list, new Transformer<X, Integer>() {
-            public Integer transform(X input) {
+            @Override
+            public Integer transform(final X input) {
                 return input.key;
             }
         }, TransformerUtils.<X> nopTransformer());
@@ -858,14 +877,14 @@
             fail("Should throw NullPointerException");
         } catch (final NullPointerException e) {
         }
-        final HashMap<String, String> map = new HashMap<String, String>();
+        final HashMap<String, String> map = new HashMap<>();
         map.put("foo", "foov");
         map.put("bar", "barv");
         map.put("baz", "bazv");
         final IterableMap<String, String> iMap = MapUtils.iterableMap(map);
         assertEquals(map, iMap);
         assertNotSame(map, iMap);
-        final HashedMap<String, String> hMap = new HashedMap<String, String>(map);
+        final HashedMap<String, String> hMap = new HashedMap<>(map);
         assertSame(hMap, MapUtils.iterableMap(hMap));
     }
 
@@ -876,7 +895,7 @@
             fail("Should throw NullPointerException");
         } catch (final NullPointerException e) {
         }
-        final TreeMap<String, String> map = new TreeMap<String, String>();
+        final TreeMap<String, String> map = new TreeMap<>();
         map.put("foo", "foov");
         map.put("bar", "barv");
         map.put("baz", "bazv");
@@ -886,4 +905,264 @@
         assertSame(iMap, MapUtils.iterableMap(iMap));
     }
 
+    @Test
+    public void testSize0() {
+        assertEquals(0, MapUtils.size(new HashMap<>()));
+    }
+
+    @Test
+    public void testSizeNull() {
+        assertEquals(0, MapUtils.size(null));
+    }
+
+    @Test
+    public void testSize() {
+        final HashMap<Object, Object> map = new HashMap<>();
+        map.put("A", "1");
+        map.put("B", "2");
+        assertEquals(2, MapUtils.size(map));
+    }
+
+    @Test
+    public void testToProperties() {
+        final Map<String, String> in = new HashMap<>();
+        in.put("key1", "A");
+        in.put("key2", "B");
+        in.put("key3", "C");
+
+        final Properties out =  MapUtils.toProperties(in);
+
+        assertEquals(in.get("key1"), out.get("key1"));
+        assertEquals(in.get("key2"), out.get("key2"));
+        assertEquals(in.get("key3"), out.get("key3"));
+    }
+
+    @Test
+    public void testToPropertiesEmpty() {
+        final Map<String, String> in = null;
+        final Properties out =  MapUtils.toProperties(in);
+
+        assertEquals(out.size(), 0);
+    }
+
+    @Test
+    public void testgetDoubleValue() {
+        final Map<String, Double> in = new HashMap<>();
+        in.put("key", 2.0);
+
+        assertEquals(2.0, MapUtils.getDoubleValue(in,"key", 0.0), 0);
+        assertEquals(2.0, MapUtils.getDoubleValue(in,"key"), 0);
+        assertEquals(1.0, MapUtils.getDoubleValue(in,"noKey", 1.0), 0);
+        assertEquals(0, MapUtils.getDoubleValue(in,"noKey"), 0);
+        assertEquals(2.0, MapUtils.getDouble(in,"key", 0.0), 0);
+        assertEquals(1.0, MapUtils.getDouble(in,"noKey", 1.0), 0);
+
+
+        final Map<String, String> inStr = new HashMap<>();
+        final char decimalSeparator = getDecimalSeparator();
+        inStr.put("str1", "2" + decimalSeparator + "0");
+
+        assertEquals(MapUtils.getDoubleValue(inStr,"str1", 0.0), 2.0, 0);
+    }
+
+    @Test
+    public void testgetFloatValue() {
+        final Map<String, Float> in = new HashMap<>();
+        in.put("key", 2.0f);
+
+        assertEquals(2.0, MapUtils.getFloatValue(in,"key", 0.0f), 0);
+        assertEquals(2.0, MapUtils.getFloatValue(in,"key"), 0);
+        assertEquals(1.0, MapUtils.getFloatValue(in,"noKey", 1.0f), 0);
+        assertEquals(0, MapUtils.getFloatValue(in,"noKey"), 0);
+        assertEquals(2.0, MapUtils.getFloat(in,"key", 0.0f), 0);
+        assertEquals(1.0, MapUtils.getFloat(in,"noKey", 1.0f), 0);
+
+        final Map<String, String> inStr = new HashMap<>();
+        final char decimalSeparator = getDecimalSeparator();
+        inStr.put("str1", "2" + decimalSeparator + "0");
+
+        assertEquals(MapUtils.getFloatValue(inStr,"str1", 0.0f), 2.0, 0);
+    }
+
+    @Test
+    public void testgetLongValue() {
+        final Map<String, Long> in = new HashMap<>();
+        in.put("key", 2L);
+
+        assertEquals(2.0, MapUtils.getLongValue(in,"key", 0L), 0);
+        assertEquals(2.0, MapUtils.getLongValue(in,"key"), 0);
+        assertEquals(1, MapUtils.getLongValue(in,"noKey", 1L), 0);
+        assertEquals(0, MapUtils.getLongValue(in,"noKey"), 0);
+        assertEquals(2.0, MapUtils.getLong(in,"key", 0L), 0);
+        assertEquals(1, MapUtils.getLong(in,"noKey", 1L), 0);
+
+        final Map<String, String> inStr = new HashMap<>();
+        inStr.put("str1", "2");
+
+        assertEquals(MapUtils.getLongValue(inStr,"str1", 0L), 2, 0);
+        assertEquals(MapUtils.getLong(inStr, "str1", 1L), 2, 0);
+
+    }
+
+    @Test
+    public void testgetIntValue() {
+        final Map<String, Integer> in = new HashMap<>();
+        in.put("key", 2);
+
+        assertEquals(2, MapUtils.getIntValue(in,"key", 0), 0);
+        assertEquals(2, MapUtils.getIntValue(in,"key"), 0);
+        assertEquals(0, MapUtils.getIntValue(in,"noKey", 0), 0);
+        assertEquals(0, MapUtils.getIntValue(in,"noKey"), 0);
+        assertEquals(2, MapUtils.getInteger(in,"key", 0), 0);
+        assertEquals(0, MapUtils.getInteger(in,"noKey", 0), 0);
+
+        final Map<String, String> inStr = new HashMap<>();
+        inStr.put("str1", "2");
+
+        assertEquals(MapUtils.getIntValue(inStr,"str1", 0), 2, 0);
+    }
+
+    @Test
+    public void testgetShortValue() {
+        final Map<String, Short> in = new HashMap<>();
+        final short val = 10;
+        in.put("key", val);
+
+        assertEquals(val, MapUtils.getShortValue(in,"key", val), 0);
+        assertEquals(val, MapUtils.getShortValue(in,"key"), 0);
+        assertEquals(val, MapUtils.getShortValue(in,"noKey", val), 0);
+        assertEquals(0, MapUtils.getShortValue(in,"noKey"), 0);
+        assertEquals(val, MapUtils.getShort(in,"key", val), 0);
+        assertEquals(val,MapUtils.getShort(in,"noKey", val), 0);
+
+        final Map<String, String> inStr = new HashMap<>();
+        inStr.put("str1", "10");
+
+        assertEquals(MapUtils.getShortValue(inStr,"str1", val), val, 0);
+    }
+
+    @Test
+    public void testgetByteValue() {
+        final Map<String, Byte> in = new HashMap<>();
+        final byte val = 100;
+        in.put("key", val);
+
+        assertEquals(val, MapUtils.getByteValue(in,"key", val), 0);
+        assertEquals(val, MapUtils.getByteValue(in,"key"), 0);
+        assertEquals(val, MapUtils.getByteValue(in,"noKey", val), 0);
+        assertEquals(0, MapUtils.getByteValue(in,"noKey"), 0);
+        assertEquals(val, MapUtils.getByte(in,"key", val), 0);
+        assertEquals(val, MapUtils.getByte(in,"noKey", val), 0);
+
+
+        final Map<String, String> inStr = new HashMap<>();
+        inStr.put("str1", "100");
+
+        assertEquals(MapUtils.getByteValue(inStr,"str1", val), val, 0);
+    }
+
+    @Test
+    public void testgetNumber() {
+        final Map<String, Number> in = new HashMap<>();
+        final Number val = 1000;
+        in.put("key", val);
+
+        assertEquals(val.intValue(), MapUtils.getNumber(in,"key", val).intValue(), 0);
+        assertEquals(val.intValue(), MapUtils.getNumber(in,"noKey", val).intValue(), 0);
+
+    }
+
+    @Test
+    public void testgetString() {
+        final Map<String, String> in = new HashMap<>();
+        in.put("key", "str");
+
+        assertEquals("str", MapUtils.getString(in,"key", "defualt"));
+        assertEquals("str", MapUtils.getString(in,"key"));
+        assertEquals(null, MapUtils.getString(null,"key"));
+        assertEquals("default", MapUtils.getString(in,"noKey", "default"));
+        assertEquals("default", MapUtils.getString(null,"noKey", "default"));
+
+    }
+
+    @Test
+    public void testgetObject() {
+        final Map<String, Object> in = new HashMap<>();
+        in.put("key", "str");
+
+        assertEquals("str", MapUtils.getObject(in,"key", "defualt"));
+        assertEquals("str", MapUtils.getObject(in,"key"));
+        assertEquals(null, MapUtils.getObject(null,"key"));
+        assertEquals("default", MapUtils.getObject(in,"noKey", "default"));
+        assertEquals("default", MapUtils.getObject(null,"noKey", "default"));
+
+    }
+
+    @Test
+    public void testgetBooleanValue() {
+        final Map<String, Boolean> in = new HashMap<>();
+        in.put("key", true);
+
+        assertTrue(MapUtils.getBooleanValue(in,"key", true));
+        assertTrue(MapUtils.getBooleanValue(in,"key"));
+        assertTrue(MapUtils.getBooleanValue(in,"noKey", true));
+        assertTrue(!MapUtils.getBooleanValue(in,"noKey"));
+        assertTrue(MapUtils.getBoolean(in,"key", true));
+        assertTrue(MapUtils.getBoolean(in,"noKey", true));
+        assertEquals(null, MapUtils.getBoolean(null,"noKey"));
+
+
+
+        final Map<String, String> inStr = new HashMap<>();
+        inStr.put("str1", "true");
+
+        assertTrue(MapUtils.getBooleanValue(inStr,"str1", true));
+        assertTrue(MapUtils.getBoolean(inStr,"str1", true));
+
+
+    }
+
+    @Test
+    public void testgetMap() {
+        final Map<String, Map<String,String>> in = new HashMap<>();
+        final Map<String, String> valMap = new HashMap<>();
+        valMap.put("key1", "value1");
+        in.put("key1", valMap);
+        final Map<?, ?> outValue =  MapUtils.getMap(in,"key1", null);
+
+        assertEquals("value1", outValue.get("key1"));
+        assertEquals(null, outValue.get("key2"));
+        assertEquals(null, MapUtils.getMap(in,"key2", null));
+        assertEquals(null, MapUtils.getMap(null,"key2", null));
+    }
+
+    @Test
+    public void testSafeAddToMap() {
+
+        final Map<String, Object> inMap = new HashMap<>();
+
+        MapUtils.safeAddToMap(inMap,"key1", "value1");
+        MapUtils.safeAddToMap(inMap,"key2", null);
+        assertEquals("value1", inMap.get("key1"));
+        assertEquals("", inMap.get("key2"));
+    }
+
+    @Test
+    public void testOrderedMap() {
+    	final Map<String, String> inMap = new HashMap<>();
+    	inMap.put("key1", "value1");
+    	inMap.put("key2", "value2");
+        final Map<String, String> map = MapUtils.orderedMap(inMap);
+        assertTrue("returned object should be a OrderedMap", map instanceof OrderedMap);
+    }
+
+    private char getDecimalSeparator() {
+        final NumberFormat numberFormat = NumberFormat.getInstance();
+        if (numberFormat instanceof DecimalFormat) {
+            return ((DecimalFormat) numberFormat).getDecimalFormatSymbols().getDecimalSeparator();
+        }
+        return '.';
+    }
+
+
 }
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/MockTestCase.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/MockTestCase.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/MockTestCase.java	2013-04-17 17:37:03.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/MockTestCase.java	2018-07-08 00:18:18.000000000 +0000
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,7 +29,7 @@
  * that call the respective methods on all created mock objects.
  */
 public abstract class MockTestCase {
-    private final List<Object> mockObjects = new ArrayList<Object>();
+    private final List<Object> mockObjects = new ArrayList<>();
 
     @SuppressWarnings("unchecked")
     protected <T> T createMock(final Class<?> name) {
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapTest.java	2015-11-22 21:11:49.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -48,7 +48,6 @@
  * necessary override the {@link #makeFullMap()} method.
  *
  * @since 4.1
- * @version $Id: AbstractMultiValuedMapTest.java 1715695 2015-11-22 21:11:49Z tn $
  */
 public abstract class AbstractMultiValuedMapTest<K, V> extends AbstractObjectTest {
 
@@ -58,7 +57,7 @@
     /** MultiValuedHashMap created by reset(). */
     protected MultiValuedMap<K, V> confirmed;
 
-    public AbstractMultiValuedMapTest(String testName) {
+    public AbstractMultiValuedMapTest(final String testName) {
         super(testName);
     }
 
@@ -147,7 +146,7 @@
         return map;
     }
 
-    protected void addSampleMappings(MultiValuedMap<? super K, ? super V> map) {
+    protected void addSampleMappings(final MultiValuedMap<? super K, ? super V> map) {
         final K[] keys = getSampleKeys();
         final V[] values = getSampleValues();
         for (int i = 0; i < keys.length; i++) {
@@ -162,14 +161,14 @@
      * @return a MultiValuedMap that is known to be valid
      */
     public MultiValuedMap<K, V> makeConfirmedMap() {
-        return new ArrayListValuedHashMap<K, V>();
+        return new ArrayListValuedHashMap<>();
     }
 
     public MultiValuedMap<K, V> getConfirmed() {
         return this.confirmed;
     }
 
-    public void setConfirmed(MultiValuedMap<K, V> map) {
+    public void setConfirmed(final MultiValuedMap<K, V> map) {
         this.confirmed = map;
     }
 
@@ -207,6 +206,7 @@
     public void testMultipleValues() {
         final MultiValuedMap<K, V> map = makeFullMap();
         @SuppressWarnings("unchecked")
+        final
         Collection<V> col = map.get((K) "one");
         assertTrue(col.contains("uno"));
         assertTrue(col.contains("un"));
@@ -230,8 +230,8 @@
         }
         resetEmpty();
         final MultiValuedMap<K, V> map =  getMap();
-        Collection<V> col1 = map.get((K) "one");
-        Collection<V> col2 = map.get((K) "one");
+        final Collection<V> col1 = map.get((K) "one");
+        final Collection<V> col2 = map.get((K) "one");
         assertTrue(col1.isEmpty());
         assertTrue(col2.isEmpty());
         assertEquals(0, map.size());
@@ -276,6 +276,7 @@
         resetFull();
         final MultiValuedMap<K, V> map = getMap();
         @SuppressWarnings("unchecked")
+        final
         Iterator<V> it = map.get((K) "one").iterator();
         while (it.hasNext()) {
             it.next();
@@ -287,7 +288,7 @@
         assertFalse(map.containsValue("uno"));
         assertFalse(map.containsValue("un"));
         assertEquals(4, map.size());
-        Collection<V> coll = map.remove("one");
+        final Collection<V> coll = map.remove("one");
         assertNotNull(coll);
         assertEquals(0, coll.size());
     }
@@ -317,7 +318,7 @@
     @SuppressWarnings("unchecked")
     public void testValues() {
         final MultiValuedMap<K, V> map = makeFullMap();
-        final HashSet<V> expected = new HashSet<V>();
+        final HashSet<V> expected = new HashSet<>();
         expected.add((V) "uno");
         expected.add((V) "dos");
         expected.add((V) "tres");
@@ -326,7 +327,7 @@
         expected.add((V) "trois");
         final Collection<V> c = map.values();
         assertEquals(6, c.size());
-        assertEquals(expected, new HashSet<V>(c));
+        assertEquals(expected, new HashSet<>(c));
     }
 
 //    public void testKeyedIterator() {
@@ -355,7 +356,7 @@
             return;
         }
         final MultiValuedMap<K, V> map = makeFullMap();
-        Collection<V> values = map.values();
+        final Collection<V> values = map.values();
         values.remove("uno");
         values.remove("un");
         assertFalse(map.containsKey("one"));
@@ -389,10 +390,10 @@
 
     public void testEntriesCollectionIterator() {
         final MultiValuedMap<K, V> map = makeFullMap();
-        Collection<V> values = new ArrayList<V>(map.values());
-        Iterator<Map.Entry<K, V>> iterator = map.entries().iterator();
+        final Collection<V> values = new ArrayList<>(map.values());
+        final Iterator<Map.Entry<K, V>> iterator = map.entries().iterator();
         while (iterator.hasNext()) {
-            Map.Entry<K, V> entry = iterator.next();
+            final Map.Entry<K, V> entry = iterator.next();
             assertTrue(map.containsMapping(entry.getKey(), entry.getValue()));
             assertTrue(values.contains(entry.getValue()));
             if (isRemoveSupported()) {
@@ -560,7 +561,7 @@
         if (!isAddSupported()) {
             return;
         }
-        final Map<K, V> original = new HashMap<K, V>();
+        final Map<K, V> original = new HashMap<>();
         original.put((K) "keyX", (V) "object1");
         original.put((K) "keyY", (V) "object2");
 
@@ -597,7 +598,7 @@
         try {
             map.putAll((K) "A", null);
             fail("expecting NullPointerException");
-        } catch (NullPointerException npe) {
+        } catch (final NullPointerException npe) {
             // expected
         }
 
@@ -639,8 +640,8 @@
     }
 
     public void testKeysMultiSet() {
-        MultiValuedMap<K, V> map = makeFullMap();
-        MultiSet<K> keyMultiSet = map.keys();
+        final MultiValuedMap<K, V> map = makeFullMap();
+        final MultiSet<K> keyMultiSet = map.keys();
         assertEquals(2, keyMultiSet.getCount("one"));
         assertEquals(2, keyMultiSet.getCount("two"));
         assertEquals(2, keyMultiSet.getCount("three"));
@@ -648,13 +649,13 @@
     }
 
     public void testKeysBagIterator() {
-        MultiValuedMap<K, V> map = makeFullMap();
-        Collection<K> col = new ArrayList<K>();
-        Iterator<K> it = map.keys().iterator();
+        final MultiValuedMap<K, V> map = makeFullMap();
+        final Collection<K> col = new ArrayList<>();
+        final Iterator<K> it = map.keys().iterator();
         while (it.hasNext()) {
             col.add(it.next());
         }
-        Bag<K> bag = new HashBag<K>(col);
+        final Bag<K> bag = new HashBag<>(col);
         assertEquals(2, bag.getCount("one"));
         assertEquals(2, bag.getCount("two"));
         assertEquals(2, bag.getCount("three"));
@@ -663,9 +664,9 @@
 
     @SuppressWarnings("unchecked")
     public void testKeysBagContainsAll() {
-        MultiValuedMap<K, V> map = makeFullMap();
-        MultiSet<K> keyMultiSet = map.keys();
-        Collection<K> col = (Collection<K>) Arrays.asList("one", "two", "three", "one", "two", "three");
+        final MultiValuedMap<K, V> map = makeFullMap();
+        final MultiSet<K> keyMultiSet = map.keys();
+        final Collection<K> col = (Collection<K>) Arrays.asList("one", "two", "three", "one", "two", "three");
         assertTrue(keyMultiSet.containsAll(col));
     }
 
@@ -677,7 +678,7 @@
 
         resetFull();
         mapCol = getMap().asMap();
-        Collection<V> col = mapCol.get("one");
+        final Collection<V> col = mapCol.get("one");
         assertNotNull(col);
         assertTrue(col.contains("un"));
         assertTrue(col.contains("uno"));
@@ -688,7 +689,7 @@
             return;
         }
         resetFull();
-        Map<K, Collection<V>> mapCol = getMap().asMap();
+        final Map<K, Collection<V>> mapCol = getMap().asMap();
         mapCol.remove("one");
         assertFalse(getMap().containsKey("one"));
         assertEquals(4, getMap().size());
@@ -702,8 +703,8 @@
         resetFull();
         mapIt = getMap().mapIterator();
         while (mapIt.hasNext()) {
-            K key = mapIt.next();
-            V value = mapIt.getValue();
+            final K key = mapIt.next();
+            final V value = mapIt.getValue();
             assertTrue(getMap().containsMapping(key, value));
         }
     }
@@ -713,7 +714,7 @@
             return;
         }
         resetFull();
-        MapIterator<K, V> mapIt = getMap().mapIterator();
+        final MapIterator<K, V> mapIt = getMap().mapIterator();
         while (mapIt.hasNext()) {
             mapIt.next();
             mapIt.remove();
@@ -724,12 +725,12 @@
     @SuppressWarnings("unchecked")
     public void testMapIteratorUnsupportedSet() {
         resetFull();
-        MapIterator<K, V> mapIt = getMap().mapIterator();
+        final MapIterator<K, V> mapIt = getMap().mapIterator();
         mapIt.next();
         try {
             mapIt.setValue((V) "some value");
             fail();
-        } catch (UnsupportedOperationException e) {
+        } catch (final UnsupportedOperationException e) {
         }
     }
 
@@ -1076,8 +1077,8 @@
         @Override
         @SuppressWarnings("unchecked")
         public K[] getSampleKeys() {
-            K[] samplekeys = AbstractMultiValuedMapTest.this.getSampleKeys();
-            Object[] finalKeys = new Object[3];
+            final K[] samplekeys = AbstractMultiValuedMapTest.this.getSampleKeys();
+            final Object[] finalKeys = new Object[3];
             for (int i = 0; i < 3; i++) {
                 finalKeys[i] = samplekeys[i * 2];
             }
@@ -1087,12 +1088,15 @@
         @Override
         @SuppressWarnings("unchecked")
         public Collection<V>[] getSampleValues() {
-            boolean isSetValuedMap = AbstractMultiValuedMapTest.this.getMap() instanceof SetValuedMap;
-            V[] sampleValues = AbstractMultiValuedMapTest.this.getSampleValues();
-            Collection<V>[] colArr = new Collection[3];
+            // Calling getMap() instead of makeObject() would make more sense, but due to concurrency
+            // issues, this may lead to intermittent issues. See COLLECTIONS-661. A better solution
+            // would be to re-design the tests, or add a boolean method to the parent.
+            final boolean isSetValuedMap = AbstractMultiValuedMapTest.this.makeObject() instanceof SetValuedMap;
+            final V[] sampleValues = AbstractMultiValuedMapTest.this.getSampleValues();
+            final Collection<V>[] colArr = new Collection[3];
             for(int i = 0; i < 3; i++) {
-                Collection<V> coll = Arrays.asList(sampleValues[i*2], sampleValues[i*2 + 1]);
-                colArr[i] = isSetValuedMap ? new HashSet<V>(coll) : coll;
+                final Collection<V> coll = Arrays.asList(sampleValues[i*2], sampleValues[i*2 + 1]);
+                colArr[i] = isSetValuedMap ? new HashSet<>(coll) : coll;
             }
             return colArr;
         }
@@ -1100,12 +1104,14 @@
         @Override
         @SuppressWarnings("unchecked")
         public Collection<V>[] getNewSampleValues() {
-            boolean isSetValuedMap = AbstractMultiValuedMapTest.this.getMap() instanceof SetValuedMap;
-            Object[] sampleValues = { "ein", "ek", "zwei", "duey", "drei", "teen" };
-            Collection<V>[] colArr = new Collection[3];
+            // See comment in getSampleValues() to understand why we are calling makeObject() and not
+            // getMap(). See COLLECTIONS-661 for more.
+            final boolean isSetValuedMap = AbstractMultiValuedMapTest.this.makeObject() instanceof SetValuedMap;
+            final Object[] sampleValues = { "ein", "ek", "zwei", "duey", "drei", "teen" };
+            final Collection<V>[] colArr = new Collection[3];
             for (int i = 0; i < 3; i++) {
-                Collection<V> coll = Arrays.asList((V) sampleValues[i * 2], (V) sampleValues[i * 2 + 1]);
-                colArr[i] = isSetValuedMap ? new HashSet<V>(coll) : coll;
+                final Collection<V> coll = Arrays.asList((V) sampleValues[i * 2], (V) sampleValues[i * 2 + 1]);
+                colArr[i] = isSetValuedMap ? new HashSet<>(coll) : coll;
             }
             return colArr;
         }
@@ -1129,7 +1135,7 @@
         public boolean isRemoveSupported() {
             return AbstractMultiValuedMapTest.this.isRemoveSupported();
         }
-        
+
         @Override
         public boolean areEqualElementsDistinguishable() {
             // work-around for a problem with the EntrySet: the entries contain
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMapTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMapTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMapTest.java	2015-11-23 21:23:57.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/multimap/ArrayListValuedHashMapTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -29,11 +29,10 @@
  * Test ArrayListValuedHashMap
  *
  * @since 4.1
- * @version $Id: ArrayListValuedHashMapTest.java 1715958 2015-11-23 21:23:57Z tn $
  */
 public class ArrayListValuedHashMapTest<K, V> extends AbstractMultiValuedMapTest<K, V> {
 
-    public ArrayListValuedHashMapTest(String testName) {
+    public ArrayListValuedHashMapTest(final String testName) {
         super(testName);
     }
 
@@ -44,7 +43,7 @@
     // -----------------------------------------------------------------------
     @Override
     public ListValuedMap<K, V> makeObject() {
-        return new ArrayListValuedHashMap<K, V>();
+        return new ArrayListValuedHashMap<>();
     }
 
     // -----------------------------------------------------------------------
@@ -52,7 +51,7 @@
     public void testListValuedMapAdd() {
         final ListValuedMap<K, V> listMap = makeObject();
         assertTrue(listMap.get((K) "whatever") instanceof List);
-        List<V> list = listMap.get((K) "A");
+        final List<V> list = listMap.get((K) "A");
         list.add((V) "a1");
         assertEquals(1, listMap.size());
         assertTrue(listMap.containsKey("A"));
@@ -61,7 +60,7 @@
     @SuppressWarnings("unchecked")
     public void testListValuedMapAddViaListIterator() {
         final ListValuedMap<K, V> listMap = makeObject();
-        ListIterator<V> listIt = listMap.get((K) "B").listIterator();
+        final ListIterator<V> listIt = listMap.get((K) "B").listIterator();
         assertFalse(listIt.hasNext());
         listIt.add((V) "b1");
         listIt.add((V) "b2");
@@ -75,7 +74,7 @@
     @SuppressWarnings("unchecked")
     public void testListValuedMapRemove() {
         final ListValuedMap<K, V> listMap = makeObject();
-        List<V> list = listMap.get((K) "A");
+        final List<V> list = listMap.get((K) "A");
         list.add((V) "a1");
         list.add((V) "a2");
         list.add((V) "a3");
@@ -111,8 +110,8 @@
 
     @SuppressWarnings({ "unchecked", "rawtypes" })
     public void testEqualsHashCodeContract() {
-        MultiValuedMap map1 = makeObject();
-        MultiValuedMap map2 = makeObject();
+        final MultiValuedMap map1 = makeObject();
+        final MultiValuedMap map2 = makeObject();
 
         map1.put("a", "a1");
         map1.put("a", "a2");
@@ -128,8 +127,8 @@
 
     @SuppressWarnings({ "unchecked", "rawtypes" })
     public void testListValuedMapEqualsHashCodeContract() {
-        ListValuedMap map1 = makeObject();
-        ListValuedMap map2 = makeObject();
+        final ListValuedMap map1 = makeObject();
+        final ListValuedMap map2 = makeObject();
 
         map1.put("a", "a1");
         map1.put("a", "a2");
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/multimap/HashSetValuedHashMapTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/multimap/HashSetValuedHashMapTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/multimap/HashSetValuedHashMapTest.java	2015-11-23 21:23:57.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/multimap/HashSetValuedHashMapTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -29,11 +29,10 @@
  * Test HashSetValuedHashMap
  *
  * @since 4.1
- * @version $Id: HashSetValuedHashMapTest.java 1715958 2015-11-23 21:23:57Z tn $
  */
 public class HashSetValuedHashMapTest<K, V> extends AbstractMultiValuedMapTest<K, V> {
 
-    public HashSetValuedHashMapTest(String testName) {
+    public HashSetValuedHashMapTest(final String testName) {
         super(testName);
     }
 
@@ -44,12 +43,12 @@
     // -----------------------------------------------------------------------
     @Override
     public SetValuedMap<K, V> makeObject() {
-        return new HashSetValuedHashMap<K, V>();
+        return new HashSetValuedHashMap<>();
     }
 
     @Override
     public MultiValuedMap<K, V> makeConfirmedMap() {
-        return new HashSetValuedHashMap<K, V>();
+        return new HashSetValuedHashMap<>();
     }
 
     // -----------------------------------------------------------------------
@@ -58,7 +57,7 @@
         final SetValuedMap<K, V> setMap = makeObject();
         assertTrue(setMap.get((K) "whatever") instanceof Set);
 
-        Set<V> set = setMap.get((K) "A");
+        final Set<V> set = setMap.get((K) "A");
         assertTrue(set.add((V) "a1"));
         assertTrue(set.add((V) "a2"));
         assertFalse(set.add((V) "a1"));
@@ -71,7 +70,7 @@
         final SetValuedMap<K, V> setMap = makeObject();
         assertTrue(setMap.get((K) "whatever") instanceof Set);
 
-        Set<V> set = setMap.get((K) "A");
+        final Set<V> set = setMap.get((K) "A");
         assertTrue(set.add((V) "a1"));
         assertTrue(set.add((V) "a2"));
         assertFalse(set.add((V) "a1"));
@@ -91,12 +90,12 @@
         final SetValuedMap<K, V> setMap = makeObject();
         assertTrue(setMap.get((K) "whatever") instanceof Set);
 
-        Set<V> set = setMap.get((K) "A");
+        final Set<V> set = setMap.get((K) "A");
         set.add((V) "a1");
         set.add((V) "a2");
         set.add((V) "a1");
 
-        Iterator<V> it = set.iterator();
+        final Iterator<V> it = set.iterator();
         while (it.hasNext()) {
             it.next();
             it.remove();
@@ -107,8 +106,8 @@
 
     @SuppressWarnings({ "unchecked", "rawtypes" })
     public void testSetValuedMapEqualsHashCodeContract() {
-        SetValuedMap map1 = makeObject();
-        SetValuedMap map2 = makeObject();
+        final SetValuedMap map1 = makeObject();
+        final SetValuedMap map2 = makeObject();
 
         map1.put("a", "a1");
         map1.put("a", "a2");
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/multimap/TransformedMultiValuedMapTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/multimap/TransformedMultiValuedMapTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/multimap/TransformedMultiValuedMapTest.java	2015-11-23 21:23:57.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/multimap/TransformedMultiValuedMapTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -28,13 +28,12 @@
 
 /**
  * Tests for TransformedMultiValuedMap
- * 
+ *
  * @since 4.1
- * @version $Id: TransformedMultiValuedMapTest.java 1715958 2015-11-23 21:23:57Z tn $
  */
 public class TransformedMultiValuedMapTest<K, V> extends AbstractMultiValuedMapTest<K, V> {
 
-    public TransformedMultiValuedMapTest(String testName) {
+    public TransformedMultiValuedMapTest(final String testName) {
         super(testName);
     }
 
@@ -54,7 +53,7 @@
     public void testKeyTransformedMap() {
         final Object[] els = new Object[] { "1", "3", "5", "7", "2", "4", "6" };
 
-        MultiValuedMap<K, V> map = TransformedMultiValuedMap.transformingMap(
+        final MultiValuedMap<K, V> map = TransformedMultiValuedMap.transformingMap(
                 new ArrayListValuedHashMap<K, V>(),
                 (Transformer<? super K, ? extends K>) TransformedCollectionTest.STRING_TO_INTEGER_TRANSFORMER,
                 null);
@@ -68,7 +67,7 @@
             assertEquals(true, map.get((K) Integer.valueOf((String) els[i])).contains(els[i]));
         }
 
-        Collection<V> coll = map.remove(els[0]);
+        final Collection<V> coll = map.remove(els[0]);
         assertNotNull(coll);
         assertEquals(0, coll.size());
         assertEquals(true, map.remove(Integer.valueOf((String) els[0])).contains(els[0]));
@@ -78,7 +77,7 @@
     public void testValueTransformedMap() {
         final Object[] els = new Object[] { "1", "3", "5", "7", "2", "4", "6" };
 
-        MultiValuedMap<K, V> map = TransformedMultiValuedMap.transformingMap(
+        final MultiValuedMap<K, V> map = TransformedMultiValuedMap.transformingMap(
                 new ArrayListValuedHashMap<K, V>(), null,
                 (Transformer<? super V, ? extends V>) TransformedCollectionTest.STRING_TO_INTEGER_TRANSFORMER);
         assertEquals(0, map.size());
@@ -96,7 +95,7 @@
     // -----------------------------------------------------------------------
     @SuppressWarnings("unchecked")
     public void testFactory_Decorate() {
-        final MultiValuedMap<K, V> base = new ArrayListValuedHashMap<K, V>();
+        final MultiValuedMap<K, V> base = new ArrayListValuedHashMap<>();
         base.put((K) "A", (V) "1");
         base.put((K) "B", (V) "2");
         base.put((K) "C", (V) "3");
@@ -116,7 +115,7 @@
 
     @SuppressWarnings("unchecked")
     public void testFactory_decorateTransform() {
-        final MultiValuedMap<K, V> base = new ArrayListValuedHashMap<K, V>();
+        final MultiValuedMap<K, V> base = new ArrayListValuedHashMap<>();
         base.put((K) "A", (V) "1");
         base.put((K) "B", (V) "2");
         base.put((K) "C", (V) "3");
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMapTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMapTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMapTest.java	2015-11-23 21:23:57.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/multimap/UnmodifiableMultiValuedMapTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -33,20 +33,19 @@
 
 /**
  * Tests for UnmodifiableMultiValuedMap
- * 
+ *
  * @since 4.1
- * @version $Id: UnmodifiableMultiValuedMapTest.java 1715958 2015-11-23 21:23:57Z tn $
  */
 public class UnmodifiableMultiValuedMapTest<K, V> extends AbstractMultiValuedMapTest<K, V> {
 
-    public UnmodifiableMultiValuedMapTest(String testName) {
+    public UnmodifiableMultiValuedMapTest(final String testName) {
         super(testName);
     }
 
     public static Test suite() {
         return BulkTest.makeSuite(UnmodifiableMultiValuedMapTest.class);
     }
-    
+
     // -----------------------------------------------------------------------
     @Override
     public boolean isAddSupported() {
@@ -66,7 +65,7 @@
 
     @Override
     protected MultiValuedMap<K, V> makeFullMap() {
-        final MultiValuedMap<K, V> map = new ArrayListValuedHashMap<K, V>();
+        final MultiValuedMap<K, V> map = new ArrayListValuedHashMap<>();
         addSampleMappings(map);
         return UnmodifiableMultiValuedMap.<K, V> unmodifiableMultiValuedMap(map);
     }
@@ -86,179 +85,179 @@
         try {
             UnmodifiableMultiValuedMap.unmodifiableMultiValuedMap(null);
             fail("map must not be null");
-        } catch (NullPointerException e) {
+        } catch (final NullPointerException e) {
             // expected
         }
     }
 
     @SuppressWarnings("unchecked")
     public void testAddException() {
-        MultiValuedMap<K, V> map = makeObject();
+        final MultiValuedMap<K, V> map = makeObject();
         try {
             map.put((K) "one", (V) "uno");
             fail();
-        } catch (UnsupportedOperationException e) {
+        } catch (final UnsupportedOperationException e) {
         }
     }
 
     @SuppressWarnings("unchecked")
     public void testUnmodifiableEntries() {
         resetFull();
-        Collection<Entry<K, V>> entries = getMap().entries();
+        final Collection<Entry<K, V>> entries = getMap().entries();
         try {
             entries.clear();
             fail();
-        } catch (UnsupportedOperationException e) {
+        } catch (final UnsupportedOperationException e) {
         }
 
-        Iterator<Entry<K, V>> it = entries.iterator();
-        Entry<K, V> entry = it.next();
+        final Iterator<Entry<K, V>> it = entries.iterator();
+        final Entry<K, V> entry = it.next();
         try {
             it.remove();
             fail();
-        } catch (UnsupportedOperationException e) {
+        } catch (final UnsupportedOperationException e) {
         }
 
         try {
             entry.setValue((V) "three");
             fail();
-        } catch (UnsupportedOperationException e) {
+        } catch (final UnsupportedOperationException e) {
         }
     }
 
     @SuppressWarnings("unchecked")
     public void testUnmodifiableMapIterator() {
         resetFull();
-        MapIterator<K, V> mapIt = getMap().mapIterator();
+        final MapIterator<K, V> mapIt = getMap().mapIterator();
         try {
             mapIt.remove();
             fail();
-        } catch (UnsupportedOperationException e) {
+        } catch (final UnsupportedOperationException e) {
         }
 
         try {
             mapIt.setValue((V) "three");
             fail();
-        } catch (UnsupportedOperationException e) {
+        } catch (final UnsupportedOperationException e) {
         }
     }
 
     @SuppressWarnings("unchecked")
     public void testUnmodifiableKeySet() {
         resetFull();
-        Set<K> keySet = getMap().keySet();
+        final Set<K> keySet = getMap().keySet();
         try {
             keySet.add((K) "four");
             fail();
-        } catch (UnsupportedOperationException e) {
+        } catch (final UnsupportedOperationException e) {
         }
 
         try {
             keySet.remove("four");
             fail();
-        } catch (UnsupportedOperationException e) {
+        } catch (final UnsupportedOperationException e) {
         }
 
         try {
             keySet.clear();
             fail();
-        } catch (UnsupportedOperationException e) {
+        } catch (final UnsupportedOperationException e) {
         }
 
-        Iterator<K> it = keySet.iterator();
+        final Iterator<K> it = keySet.iterator();
         try {
             it.remove();
             fail();
-        } catch (UnsupportedOperationException e) {
+        } catch (final UnsupportedOperationException e) {
         }
     }
 
     @SuppressWarnings("unchecked")
     public void testUnmodifiableValues() {
         resetFull();
-        Collection<V> values = getMap().values();
+        final Collection<V> values = getMap().values();
         try {
             values.add((V) "four");
             fail();
-        } catch (UnsupportedOperationException e) {
+        } catch (final UnsupportedOperationException e) {
         }
 
         try {
             values.remove("four");
             fail();
-        } catch (UnsupportedOperationException e) {
+        } catch (final UnsupportedOperationException e) {
         }
 
         try {
             values.clear();
             fail();
-        } catch (UnsupportedOperationException e) {
+        } catch (final UnsupportedOperationException e) {
         }
 
-        Iterator<V> it = values.iterator();
+        final Iterator<V> it = values.iterator();
         try {
             it.remove();
             fail();
-        } catch (UnsupportedOperationException e) {
+        } catch (final UnsupportedOperationException e) {
         }
     }
 
     @SuppressWarnings("unchecked")
     public void testUnmodifiableAsMap() {
         resetFull();
-        Map<K, Collection<V>> mapCol = getMap().asMap();
+        final Map<K, Collection<V>> mapCol = getMap().asMap();
         try {
             mapCol.put((K) "four", (Collection<V>) Arrays.asList("four"));
             fail();
-        } catch (UnsupportedOperationException e) {
+        } catch (final UnsupportedOperationException e) {
         }
 
         try {
             mapCol.remove("four");
             fail();
-        } catch (UnsupportedOperationException e) {
+        } catch (final UnsupportedOperationException e) {
         }
 
         try {
             mapCol.clear();
             fail();
-        } catch (UnsupportedOperationException e) {
+        } catch (final UnsupportedOperationException e) {
         }
 
         try {
             mapCol.clear();
             fail();
-        } catch (UnsupportedOperationException e) {
+        } catch (final UnsupportedOperationException e) {
         }
     }
 
     @SuppressWarnings("unchecked")
     public void testUnmodifiableKeys() {
         resetFull();
-        MultiSet<K> keys = getMap().keys();
+        final MultiSet<K> keys = getMap().keys();
         try {
             keys.add((K) "four");
             fail();
-        } catch (UnsupportedOperationException e) {
+        } catch (final UnsupportedOperationException e) {
         }
 
         try {
             keys.remove("four");
             fail();
-        } catch (UnsupportedOperationException e) {
+        } catch (final UnsupportedOperationException e) {
         }
 
         try {
             keys.clear();
             fail();
-        } catch (UnsupportedOperationException e) {
+        } catch (final UnsupportedOperationException e) {
         }
 
-        Iterator<K> it = keys.iterator();
+        final Iterator<K> it = keys.iterator();
         try {
             it.remove();
             fail();
-        } catch (UnsupportedOperationException e) {
+        } catch (final UnsupportedOperationException e) {
         }
     }
 
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/MultiMapUtilsTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/MultiMapUtilsTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/MultiMapUtilsTest.java	2015-11-19 23:08:01.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/MultiMapUtilsTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -33,7 +33,6 @@
  * Tests for MultiMapUtils
  *
  * @since 4.1
- * @version $Id: MultiMapUtilsTest.java 1715302 2015-11-19 23:08:01Z tn $
  */
 public class MultiMapUtilsTest {
 
@@ -45,7 +44,7 @@
         try {
             map.put("key", "value");
             fail("Should throw UnsupportedOperationException");
-        } catch (UnsupportedOperationException e) {
+        } catch (final UnsupportedOperationException e) {
         }
     }
 
@@ -56,7 +55,7 @@
         try {
             map.put("key", "value");
             fail("Should throw UnsupportedOperationException");
-        } catch (UnsupportedOperationException e) {
+        } catch (final UnsupportedOperationException e) {
         }
     }
 
@@ -64,20 +63,20 @@
     public void testEmptyIfNull() {
         assertTrue(MultiMapUtils.emptyIfNull(null).isEmpty());
 
-        final MultiValuedMap<String, String> map = new ArrayListValuedHashMap<String, String>();
+        final MultiValuedMap<String, String> map = new ArrayListValuedHashMap<>();
         map.put("item", "value");
         assertFalse(MultiMapUtils.emptyIfNull(map).isEmpty());
     }
 
     @Test
     public void testIsEmptyWithEmptyMap() {
-        final MultiValuedMap<Object, Object> map = new ArrayListValuedHashMap<Object, Object>();
+        final MultiValuedMap<Object, Object> map = new ArrayListValuedHashMap<>();
         assertEquals(true, MultiMapUtils.isEmpty(map));
     }
 
     @Test
     public void testIsEmptyWithNonEmptyMap() {
-        final MultiValuedMap<String, String> map = new ArrayListValuedHashMap<String, String>();
+        final MultiValuedMap<String, String> map = new ArrayListValuedHashMap<>();
         map.put("item", "value");
         assertEquals(false, MultiMapUtils.isEmpty(map));
     }
@@ -92,14 +91,14 @@
     public void testGetCollection() {
         assertNull(MultiMapUtils.getCollection(null, "key1"));
 
-        String values[] = { "v1", "v2", "v3" };
-        final MultiValuedMap<String, String> map = new ArrayListValuedHashMap<String, String>();
-        for (String val : values) {
+        final String values[] = { "v1", "v2", "v3" };
+        final MultiValuedMap<String, String> map = new ArrayListValuedHashMap<>();
+        for (final String val : values) {
             map.put("key1", val);
         }
 
-        Collection<String> col = MultiMapUtils.getCollection(map, "key1");
-        for (String val : values) {
+        final Collection<String> col = MultiMapUtils.getCollection(map, "key1");
+        for (final String val : values) {
             assertTrue(col.contains(val));
         }
     }
@@ -108,15 +107,15 @@
     public void testGetValuesAsList() {
         assertNull(MultiMapUtils.getValuesAsList(null, "key1"));
 
-        String values[] = { "v1", "v2", "v3" };
-        final MultiValuedMap<String, String> map = new ArrayListValuedHashMap<String, String>();
-        for (String val : values) {
+        final String values[] = { "v1", "v2", "v3" };
+        final MultiValuedMap<String, String> map = new ArrayListValuedHashMap<>();
+        for (final String val : values) {
             map.put("key1", val);
         }
 
-        List<String> list = MultiMapUtils.getValuesAsList(map, "key1");
+        final List<String> list = MultiMapUtils.getValuesAsList(map, "key1");
         int i = 0;
-        for (String val : list) {
+        for (final String val : list) {
             assertTrue(val.equals(values[i++]));
         }
     }
@@ -125,16 +124,16 @@
     public void testGetValuesAsSet() {
         assertNull(MultiMapUtils.getValuesAsList(null, "key1"));
 
-        String values[] = { "v1", "v2", "v3" };
-        final MultiValuedMap<String, String> map = new ArrayListValuedHashMap<String, String>();
-        for (String val : values) {
+        final String values[] = { "v1", "v2", "v3" };
+        final MultiValuedMap<String, String> map = new ArrayListValuedHashMap<>();
+        for (final String val : values) {
             map.put("key1", val);
             map.put("key1", val);
         }
 
-        Set<String> set = MultiMapUtils.getValuesAsSet(map, "key1");
+        final Set<String> set = MultiMapUtils.getValuesAsSet(map, "key1");
         assertEquals(3, set.size());
-        for (String val : values) {
+        for (final String val : values) {
             assertTrue(set.contains(val));
         }
     }
@@ -143,16 +142,16 @@
     public void testGetValuesAsBag() {
         assertNull(MultiMapUtils.getValuesAsBag(null, "key1"));
 
-        String values[] = { "v1", "v2", "v3" };
-        final MultiValuedMap<String, String> map = new ArrayListValuedHashMap<String, String>();
-        for (String val : values) {
+        final String values[] = { "v1", "v2", "v3" };
+        final MultiValuedMap<String, String> map = new ArrayListValuedHashMap<>();
+        for (final String val : values) {
             map.put("key1", val);
             map.put("key1", val);
         }
 
-        Bag<String> bag = MultiMapUtils.getValuesAsBag(map, "key1");
+        final Bag<String> bag = MultiMapUtils.getValuesAsBag(map, "key1");
         assertEquals(6, bag.size());
-        for (String val : values) {
+        for (final String val : values) {
             assertTrue(bag.contains(val));
             assertEquals(2, bag.getCount(val));
         }
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/multiset/AbstractMultiSetTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/multiset/AbstractMultiSetTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/multiset/AbstractMultiSetTest.java	2015-11-15 15:04:19.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/multiset/AbstractMultiSetTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -50,11 +50,10 @@
  * <p>
  * In addition to the generic collection tests (prefix testCollection) inherited
  * from AbstractCollectionTest, there are test methods that test the "normal" MultiSet
- * interface (prefix testMultiSet). For MultiSet specific tests use the {@link #makeObject()} and 
+ * interface (prefix testMultiSet). For MultiSet specific tests use the {@link #makeObject()} and
  * {@link #makeFullCollection()} methods instead of {@link #resetEmpty()} and resetFull().
  *
  * @since 4.1
- * @version $Id: AbstractMultiSetTest.java 1714462 2015-11-15 15:04:19Z tn $
  */
 public abstract class AbstractMultiSetTest<T> extends AbstractCollectionTest<T> {
 
@@ -73,7 +72,7 @@
      */
     @Override
     public Collection<T> makeConfirmedCollection() {
-        final ArrayList<T> list = new ArrayList<T>();
+        final ArrayList<T> list = new ArrayList<>();
         return list;
     }
 
@@ -153,11 +152,11 @@
     public void testMultiSetEqualsSelf() {
         final MultiSet<T> multiset = makeObject();
         assertTrue(multiset.equals(multiset));
-        
+
         if (!isAddSupported()) {
             return;
         }
-        
+
         multiset.add((T) "elt");
         assertTrue(multiset.equals(multiset));
         multiset.add((T) "elt"); // again
@@ -195,14 +194,14 @@
         if (!isRemoveSupported()) {
             return;
         }
-        
+
         final MultiSet<T> multiset = makeObject();
         multiset.add((T) "A", 2);
         assertEquals("Should have count of 2", 2, multiset.getCount("A"));
         multiset.add((T) "B");
         multiset.add((T) "C");
         assertEquals("Should have count of 4", 4, multiset.size());
-        final List<String> delete = new ArrayList<String>();
+        final List<String> delete = new ArrayList<>();
         delete.add("A");
         delete.add("B");
         multiset.removeAll(delete);
@@ -217,7 +216,7 @@
         if (!isAddSupported()) {
             return;
         }
-        
+
         final MultiSet<T> multiset = makeObject();
 
         assertEquals("MultiSet does not have at least 1 'A'", false, multiset.contains("A"));
@@ -241,17 +240,17 @@
         if (!isAddSupported()) {
             return;
         }
-        
+
         final MultiSet<T> multiset = makeObject();
-        final List<String> known = new ArrayList<String>();
-        final List<String> known1A = new ArrayList<String>();
+        final List<String> known = new ArrayList<>();
+        final List<String> known1A = new ArrayList<>();
         known1A.add("A");
-        final List<String> known2A = new ArrayList<String>();
+        final List<String> known2A = new ArrayList<>();
         known2A.add("A");
         known2A.add("A");
-        final List<String> known1B = new ArrayList<String>();
+        final List<String> known1B = new ArrayList<>();
         known1B.add("B");
-        final List<String> known1A1B = new ArrayList<String>();
+        final List<String> known1A1B = new ArrayList<>();
         known1A1B.add("A");
         known1A1B.add("B");
 
@@ -295,7 +294,7 @@
         if (!isAddSupported()) {
             return;
         }
-        
+
         final MultiSet<T> multiset = makeObject();
         assertEquals("Should have 0 total items", 0, multiset.size());
         multiset.add((T) "A");
@@ -320,7 +319,7 @@
         if (!isAddSupported()) {
             return;
         }
-        
+
         final MultiSet<T> multiset = makeObject();
         multiset.add((T) "A");
         multiset.add((T) "A");
@@ -328,7 +327,7 @@
         multiset.add((T) "B");
         multiset.add((T) "B");
         multiset.add((T) "C");
-        final List<String> retains = new ArrayList<String>();
+        final List<String> retains = new ArrayList<>();
         retains.add("B");
         retains.add("C");
         multiset.retainAll(retains);
@@ -543,7 +542,7 @@
         }
 
         final MultiSet<T> multiset = makeObject();
-        final MultiSet<T> multiset2 = new HashMultiSet<T>();
+        final MultiSet<T> multiset2 = new HashMultiSet<>();
         assertEquals(true, multiset.equals(multiset2));
         multiset.add((T) "A");
         assertEquals(false, multiset.equals(multiset2));
@@ -654,14 +653,14 @@
         public void resetEmpty() {
             AbstractMultiSetTest.this.resetEmpty();
             TestMultiSetUniqueSet.this.setCollection(AbstractMultiSetTest.this.getCollection().uniqueSet());
-            TestMultiSetUniqueSet.this.setConfirmed(new HashSet<T>(AbstractMultiSetTest.this.getConfirmed()));
+            TestMultiSetUniqueSet.this.setConfirmed(new HashSet<>(AbstractMultiSetTest.this.getConfirmed()));
         }
 
         @Override
         public void resetFull() {
             AbstractMultiSetTest.this.resetFull();
             TestMultiSetUniqueSet.this.setCollection(AbstractMultiSetTest.this.getCollection().uniqueSet());
-            TestMultiSetUniqueSet.this.setConfirmed(new HashSet<T>(AbstractMultiSetTest.this.getConfirmed()));
+            TestMultiSetUniqueSet.this.setConfirmed(new HashSet<>(AbstractMultiSetTest.this.getConfirmed()));
         }
 
         @Override
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/multiset/HashMultiSetTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/multiset/HashMultiSetTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/multiset/HashMultiSetTest.java	2015-11-15 15:04:19.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/multiset/HashMultiSetTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -26,7 +26,6 @@
  * {@link HashMultiSet} implementation.
  *
  * @since 4.1
- * @version $Id: HashMultiSetTest.java 1714462 2015-11-15 15:04:19Z tn $
  */
 public class HashMultiSetTest<T> extends AbstractMultiSetTest<T> {
 
@@ -42,7 +41,7 @@
 
     @Override
     public MultiSet<T> makeObject() {
-        return new HashMultiSet<T>();
+        return new HashMultiSet<>();
     }
 
     @Override
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/multiset/PredicatedMultiSetTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/multiset/PredicatedMultiSetTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/multiset/PredicatedMultiSetTest.java	2015-11-15 15:04:19.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/multiset/PredicatedMultiSetTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -30,7 +30,6 @@
  * {@link PredicatedMultiSet} implementation.
  *
  * @since 4.1
- * @version $Id: PredicatedMultiSetTest.java 1714462 2015-11-15 15:04:19Z tn $
  */
 public class PredicatedMultiSetTest<T> extends AbstractMultiSetTest<T> {
 
@@ -104,7 +103,7 @@
 
     @SuppressWarnings("unchecked")
     public void testIllegalDecorate() {
-        final HashMultiSet<Object> elements = new HashMultiSet<Object>();
+        final HashMultiSet<Object> elements = new HashMultiSet<>();
         elements.add("one");
         elements.add("two");
         elements.add(Integer.valueOf(3));
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/multiset/SynchronizedMultiSetTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/multiset/SynchronizedMultiSetTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/multiset/SynchronizedMultiSetTest.java	2015-11-15 15:04:19.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/multiset/SynchronizedMultiSetTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -26,7 +26,6 @@
  * {@link SynchronizedMultiSet} implementation.
  *
  * @since 4.1
- * @version $Id: SynchronizedMultiSetTest.java 1714462 2015-11-15 15:04:19Z tn $
  */
 public class SynchronizedMultiSetTest<T> extends AbstractMultiSetTest<T> {
 
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/multiset/UnmodifiableMultiSetTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/multiset/UnmodifiableMultiSetTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/multiset/UnmodifiableMultiSetTest.java	2015-11-15 15:04:19.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/multiset/UnmodifiableMultiSetTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -29,7 +29,6 @@
  * {@link UnmodifiableMultiSet} implementation.
  *
  * @since 4.1
- * @version $Id: UnmodifiableMultiSetTest.java 1714462 2015-11-15 15:04:19Z tn $
  */
 public class UnmodifiableMultiSetTest<E> extends AbstractMultiSetTest<E> {
 
@@ -49,7 +48,7 @@
 
     @Override
     public MultiSet<E> makeFullCollection() {
-        final MultiSet<E> multiset = new HashMultiSet<E>();
+        final MultiSet<E> multiset = new HashMultiSet<>();
         multiset.addAll(Arrays.asList(getFullElements()));
         return UnmodifiableMultiSet.unmodifiableMultiSet(multiset);
     }
@@ -80,7 +79,7 @@
         assertTrue(makeObject() instanceof Unmodifiable);
         assertTrue(makeFullCollection() instanceof Unmodifiable);
     }
-    
+
     public void testDecorateFactory() {
         final MultiSet<E> multiset = makeFullCollection();
         assertSame(multiset, UnmodifiableMultiSet.unmodifiableMultiSet(multiset));
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/MultiSetUtilsTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/MultiSetUtilsTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/MultiSetUtilsTest.java	1970-01-01 00:00:00.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/MultiSetUtilsTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -0,0 +1,129 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.collections4;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import java.util.Arrays;
+
+import org.apache.commons.collections4.multiset.HashMultiSet;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Tests for MultiSetUtils.
+ * @since 4.2
+ */
+public class MultiSetUtilsTest {
+
+    private String[] fullArray;
+    private MultiSet<String> multiSet;
+
+    @Before
+    public void setUp() {
+        fullArray = new String[]{
+            "a", "a", "b", "c", "d", "d", "d"
+        };
+        multiSet = new HashMultiSet<>(Arrays.asList(fullArray));
+    }
+
+    /**
+     * Tests {@link MultiSetUtils#emptyMultiSet()}.
+     */
+    @Test
+    public void testEmptyMultiSet() {
+        final MultiSet<Integer> empty = MultiSetUtils.emptyMultiSet();
+        assertEquals(0, empty.size());
+        try {
+            empty.add(55);
+            fail("Empty multi set must be read-only");
+        } catch (final UnsupportedOperationException e) {
+        }
+    }
+
+    /**
+     * Tests {@link MultiSetUtils#unmodifiableMultiSet(org.apache.commons.collections4.MultiSet) ()}.
+     */
+    @Test
+    public void testUnmodifiableMultiSet() {
+        final MultiSet<String> unmodifiable = MultiSetUtils.unmodifiableMultiSet(multiSet);
+        assertEquals(multiSet, unmodifiable);
+
+        try {
+            unmodifiable.add("a");
+            fail("Empty multi set must be read-only");
+        } catch (final UnsupportedOperationException e) {
+        }
+
+        try {
+            MultiSetUtils.unmodifiableMultiSet(null);
+            fail("Expecting NPE");
+        } catch (final NullPointerException e) {
+        }
+    }
+
+    /**
+     * Tests {@link MultiSetUtils#unmodifiableMultiSet(org.apache.commons.collections4.MultiSet) ()}.
+     */
+    @Test
+    public void testSynchronizedMultiSet() {
+        final MultiSet<String> synced = MultiSetUtils.synchronizedMultiSet(multiSet);
+        assertEquals(multiSet, synced);
+        synced.add("a"); // ensure adding works
+    }
+
+    /**
+     * Tests {@link MultiSetUtils#predicatedMultiSet(org.apache.commons.collections4.MultiSet, org.apache.commons.collections4.Predicate)}.
+     */
+    @Test
+    public void testPredicatedMultiSet() {
+        final Predicate<String> predicate = new Predicate<String>() {
+            @Override
+            public boolean evaluate(final String object) {
+                return object.length() == 1;
+            };
+        };
+        final MultiSet<String> predicated = MultiSetUtils.predicatedMultiSet(multiSet, predicate);
+        assertEquals(multiSet.size(), predicated.size());
+        assertEquals(multiSet.getCount("a"), predicated.getCount("a"));
+
+        try {
+            MultiSetUtils.predicatedMultiSet(null, predicate);
+            fail("Expecting NPE");
+        } catch (final NullPointerException e) {
+        }
+
+        try {
+            MultiSetUtils.predicatedMultiSet(multiSet, null);
+            fail("Expecting NPE");
+        } catch (final NullPointerException e) {
+        }
+
+        try {
+            MultiSetUtils.predicatedMultiSet(multiSet, new Predicate<String>() {
+                @Override
+                public boolean evaluate(final String object) {
+                    return object.equals("a");
+                };
+            });
+            fail("Predicate is violated for all elements not being 'a'");
+        }
+        catch (final IllegalArgumentException iae) {
+        }
+    }
+}
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/overview.html libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/overview.html
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/overview.html	2013-04-17 17:37:03.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/overview.html	2018-07-08 00:18:18.000000000 +0000
@@ -1,4 +1,4 @@
-<!-- $Id: overview.html 1469004 2013-04-17 17:37:03Z tn $ -->
+<!-- $Id$ -->
  <!--
    Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/PredicateUtilsTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/PredicateUtilsTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/PredicateUtilsTest.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/PredicateUtilsTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -41,7 +41,6 @@
  * Tests the PredicateUtils class.
  *
  * @since 3.0
- * @version $Id: PredicateUtilsTest.java 1686855 2015-06-22 13:00:27Z tn $
  */
 @SuppressWarnings("boxing")
 public class PredicateUtilsTest extends AbstractPredicateTest {
@@ -130,7 +129,7 @@
         assertEquals(false, PredicateUtils.notPredicate(TruePredicate.truePredicate()).evaluate(cInteger));
     }
 
-    @Test(expected=NullPointerException.class) 
+    @Test(expected=NullPointerException.class)
     public void testNotPredicateEx() {
         PredicateUtils.notPredicate(null);
     }
@@ -146,7 +145,7 @@
         assertEquals(false, PredicateUtils.andPredicate(FalsePredicate.falsePredicate(), FalsePredicate.falsePredicate()).evaluate(null));
     }
 
-    @Test(expected=NullPointerException.class) 
+    @Test(expected=NullPointerException.class)
     public void testAndPredicateEx() {
         PredicateUtils.andPredicate(null, null);
     }
@@ -166,7 +165,7 @@
                 FalsePredicate.falsePredicate(), FalsePredicate.falsePredicate(), TruePredicate.truePredicate()}).evaluate(null));
         assertEquals(false, AllPredicate.allPredicate(new Predicate[] {
                 FalsePredicate.falsePredicate(), FalsePredicate.falsePredicate(), FalsePredicate.falsePredicate()}).evaluate(null));
-        final Collection<Predicate<Object>> coll = new ArrayList<Predicate<Object>>();
+        final Collection<Predicate<Object>> coll = new ArrayList<>();
         coll.add(TruePredicate.truePredicate());
         coll.add(TruePredicate.truePredicate());
         coll.add(TruePredicate.truePredicate());
@@ -196,24 +195,24 @@
         assertTrue(AllPredicate.allPredicate(coll), null);
     }
 
-    @Test(expected=NullPointerException.class) 
+    @Test(expected=NullPointerException.class)
     public void testAllPredicateEx1() {
         AllPredicate.allPredicate((Predicate<Object>[]) null);
     }
 
     @SuppressWarnings("unchecked")
-    @Test(expected=NullPointerException.class) 
+    @Test(expected=NullPointerException.class)
     public void testAllPredicateEx2() {
         AllPredicate.<Object>allPredicate(new Predicate[] { null });
     }
 
     @SuppressWarnings("unchecked")
-    @Test(expected=NullPointerException.class) 
+    @Test(expected=NullPointerException.class)
     public void testAllPredicateEx3() {
         AllPredicate.allPredicate(new Predicate[] { null, null });
     }
 
-    @Test(expected=NullPointerException.class) 
+    @Test(expected=NullPointerException.class)
     public void testAllPredicateEx4() {
         AllPredicate.allPredicate((Collection<Predicate<Object>>) null);
     }
@@ -223,9 +222,9 @@
         AllPredicate.allPredicate(Collections.<Predicate<Object>>emptyList());
     }
 
-    @Test(expected=NullPointerException.class) 
+    @Test(expected=NullPointerException.class)
     public void testAllPredicateEx6() {
-        final Collection<Predicate<Object>> coll = new ArrayList<Predicate<Object>>();
+        final Collection<Predicate<Object>> coll = new ArrayList<>();
         coll.add(null);
         coll.add(null);
         AllPredicate.allPredicate(coll);
@@ -242,7 +241,7 @@
         assertEquals(false, PredicateUtils.orPredicate(FalsePredicate.falsePredicate(), FalsePredicate.falsePredicate()).evaluate(null));
     }
 
-    @Test(expected=NullPointerException.class) 
+    @Test(expected=NullPointerException.class)
     public void testOrPredicateEx() {
         PredicateUtils.orPredicate(null, null);
     }
@@ -263,7 +262,7 @@
                 FalsePredicate.falsePredicate(), FalsePredicate.falsePredicate(), TruePredicate.truePredicate()}).evaluate(null));
         assertEquals(false, PredicateUtils.anyPredicate(new Predicate[] {
                 FalsePredicate.falsePredicate(), FalsePredicate.falsePredicate(), FalsePredicate.falsePredicate()}).evaluate(null));
-        final Collection<Predicate<Object>> coll = new ArrayList<Predicate<Object>>();
+        final Collection<Predicate<Object>> coll = new ArrayList<>();
         coll.add(TruePredicate.truePredicate());
         coll.add(TruePredicate.truePredicate());
         coll.add(TruePredicate.truePredicate());
@@ -293,24 +292,24 @@
         assertFalse(PredicateUtils.anyPredicate(coll), null);
     }
 
-    @Test(expected=NullPointerException.class) 
+    @Test(expected=NullPointerException.class)
     public void testAnyPredicateEx1() {
         PredicateUtils.anyPredicate((Predicate<Object>[]) null);
     }
 
     @SuppressWarnings("unchecked")
-    @Test(expected=NullPointerException.class) 
+    @Test(expected=NullPointerException.class)
     public void testAnyPredicateEx2() {
         PredicateUtils.anyPredicate(new Predicate[] {null});
     }
 
     @SuppressWarnings("unchecked")
-    @Test(expected=NullPointerException.class) 
+    @Test(expected=NullPointerException.class)
     public void testAnyPredicateEx3() {
         PredicateUtils.anyPredicate(new Predicate[] {null, null});
     }
 
-    @Test(expected=NullPointerException.class) 
+    @Test(expected=NullPointerException.class)
     public void testAnyPredicateEx4() {
         PredicateUtils.anyPredicate((Collection<Predicate<Object>>) null);
     }
@@ -320,9 +319,9 @@
         PredicateUtils.anyPredicate(Collections.<Predicate<Object>>emptyList());
     }
 
-    @Test(expected=NullPointerException.class) 
+    @Test(expected=NullPointerException.class)
     public void testAnyPredicateEx6() {
-        final Collection<Predicate<Object>> coll = new ArrayList<Predicate<Object>>();
+        final Collection<Predicate<Object>> coll = new ArrayList<>();
         coll.add(null);
         coll.add(null);
         PredicateUtils.anyPredicate(coll);
@@ -339,7 +338,7 @@
         assertEquals(false, PredicateUtils.eitherPredicate(FalsePredicate.falsePredicate(), FalsePredicate.falsePredicate()).evaluate(null));
     }
 
-    @Test(expected=NullPointerException.class) 
+    @Test(expected=NullPointerException.class)
     public void testEitherPredicateEx() {
         PredicateUtils.eitherPredicate(null, null);
     }
@@ -363,7 +362,7 @@
                 FalsePredicate.falsePredicate(), FalsePredicate.falsePredicate(), TruePredicate.truePredicate()}).evaluate(null));
         assertEquals(false, PredicateUtils.onePredicate(new Predicate[] {
                 FalsePredicate.falsePredicate(), FalsePredicate.falsePredicate(), FalsePredicate.falsePredicate()}).evaluate(null));
-        final Collection<Predicate<Object>> coll = new ArrayList<Predicate<Object>>();
+        final Collection<Predicate<Object>> coll = new ArrayList<>();
         coll.add(TruePredicate.truePredicate());
         coll.add(TruePredicate.truePredicate());
         coll.add(TruePredicate.truePredicate());
@@ -393,7 +392,7 @@
         assertFalse(PredicateUtils.onePredicate(coll), null);
     }
 
-    @Test(expected=NullPointerException.class) 
+    @Test(expected=NullPointerException.class)
     public void testOnePredicateEx1() {
         PredicateUtils.onePredicate((Predicate<Object>[]) null);
     }
@@ -423,7 +422,7 @@
 
     @Test(expected=NullPointerException.class)
     public void testOnePredicateEx6() {
-        final Collection<Predicate<Object>> coll = new ArrayList<Predicate<Object>>();
+        final Collection<Predicate<Object>> coll = new ArrayList<>();
         coll.add(null);
         coll.add(null);
         PredicateUtils.onePredicate(coll);
@@ -460,7 +459,7 @@
                 FalsePredicate.falsePredicate(), FalsePredicate.falsePredicate(), TruePredicate.truePredicate() }).evaluate(null));
         assertEquals(true, PredicateUtils.nonePredicate(new Predicate[] {
                 FalsePredicate.falsePredicate(), FalsePredicate.falsePredicate(), FalsePredicate.falsePredicate() }).evaluate(null));
-        final Collection<Predicate<Object>> coll = new ArrayList<Predicate<Object>>();
+        final Collection<Predicate<Object>> coll = new ArrayList<>();
         coll.add(TruePredicate.truePredicate());
         coll.add(TruePredicate.truePredicate());
         coll.add(TruePredicate.truePredicate());
@@ -519,7 +518,7 @@
 
     @Test(expected=NullPointerException.class)
     public void testNonePredicateEx6() {
-        final Collection<Predicate<Object>> coll = new ArrayList<Predicate<Object>>();
+        final Collection<Predicate<Object>> coll = new ArrayList<>();
         coll.add(null);
         coll.add(null);
         PredicateUtils.nonePredicate(coll);
@@ -575,7 +574,7 @@
 
     @Test
     public void testInvokerPredicate() {
-        final List<Object> list = new ArrayList<Object>();
+        final List<Object> list = new ArrayList<>();
         assertEquals(true, PredicateUtils.invokerPredicate("isEmpty").evaluate(list));
         list.add(new Object());
         assertEquals(false, PredicateUtils.invokerPredicate("isEmpty").evaluate(list));
@@ -601,7 +600,7 @@
 
     @Test
     public void testInvokerPredicate2() {
-        final List<String> list = new ArrayList<String>();
+        final List<String> list = new ArrayList<>();
         assertEquals(false, PredicateUtils.invokerPredicate(
             "contains", new Class[] {Object.class}, new Object[] {cString}).evaluate(list));
         list.add(cString);
@@ -678,7 +677,7 @@
                 TransformerUtils.nopTransformer(),
                 TruePredicate.truePredicate()).evaluate(new Object()));
 
-        final Map<Object, Object> map = new HashMap<Object, Object>();
+        final Map<Object, Object> map = new HashMap<>();
         map.put(Boolean.TRUE, "Hello");
         final Transformer<Object, Object> t = TransformerUtils.mapTransformer(map);
         final Predicate<Object> p = EqualPredicate.<Object>equalPredicate("Hello");
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/properties/SortedPropertiesTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/properties/SortedPropertiesTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/properties/SortedPropertiesTest.java	1970-01-01 00:00:00.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/properties/SortedPropertiesTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.commons.collections4.properties;
+
+import java.util.Enumeration;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class SortedPropertiesTest {
+
+    @Test
+    public void testKeys() {
+        final SortedProperties sortedProperties = new SortedProperties();
+        for (char ch = 'Z'; ch >= 'A'; ch--) {
+            sortedProperties.put(String.valueOf(ch), "Value" + ch);
+        }
+        final Enumeration<Object> keys = sortedProperties.keys();
+        for (char ch = 'A'; ch <= 'Z'; ch++) {
+            Assert.assertEquals(String.valueOf(ch), keys.nextElement());
+        }
+    }
+}
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/queue/AbstractQueueTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/queue/AbstractQueueTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/queue/AbstractQueueTest.java	2013-11-11 21:58:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/queue/AbstractQueueTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -39,7 +39,6 @@
  * protected methods from AbstractCollectionTest.
  *
  * @since 4.0
- * @version $Id: AbstractQueueTest.java 1540860 2013-11-11 21:58:27Z ebourg $
  */
 public abstract class AbstractQueueTest<E> extends AbstractCollectionTest<E> {
 
@@ -73,7 +72,7 @@
     public void verify() {
         super.verify();
         final Iterator<E> iterator1 = getCollection().iterator();
-        for (E e : getConfirmed()) {
+        for (final E e : getConfirmed()) {
             assertTrue(iterator1.hasNext());
             final Object o1 = iterator1.next();
             final Object o2 = e;
@@ -87,7 +86,7 @@
      */
     @Override
     public Collection<E> makeConfirmedCollection() {
-        final ArrayList<E> list = new ArrayList<E>();
+        final ArrayList<E> list = new ArrayList<>();
         return list;
     }
 
@@ -96,7 +95,7 @@
      */
     @Override
     public Collection<E> makeConfirmedFullCollection() {
-        final ArrayList<E> list = new ArrayList<E>();
+        final ArrayList<E> list = new ArrayList<>();
         list.addAll(Arrays.asList(getFullElements()));
         return list;
     }
@@ -163,13 +162,13 @@
             assertTrue("Queue should contain added element", getCollection().contains(element));
         }
     }
-    
+
     /**
      *  Tests {@link Queue#element()}.
      */
     public void testQueueElement() {
         resetEmpty();
-        
+
         try {
             getCollection().element();
             fail("Queue.element should throw NoSuchElementException");
@@ -194,13 +193,13 @@
             }
 
             assertTrue(getConfirmed().contains(element));
-            
+
             getCollection().remove(element);
             getConfirmed().remove(element);
 
             verify();
         }
-        
+
         try {
             getCollection().element();
             fail("Queue.element should throw NoSuchElementException");
@@ -218,7 +217,7 @@
         }
 
         resetEmpty();
-        
+
         E element = getCollection().peek();
         assertNull(element);
 
@@ -233,13 +232,13 @@
             }
 
             assertTrue(getConfirmed().contains(element));
-            
+
             getCollection().remove(element);
             getConfirmed().remove(element);
 
             verify();
         }
-        
+
         element = getCollection().peek();
         assertNull(element);
     }
@@ -253,7 +252,7 @@
         }
 
         resetEmpty();
-        
+
         try {
             getCollection().remove();
             fail("Queue.remove should throw NoSuchElementException");
@@ -270,7 +269,7 @@
             assertTrue("remove should return correct element", success);
             verify();
         }
-        
+
         try {
             getCollection().element();
             fail("Queue.remove should throw NoSuchElementException");
@@ -288,7 +287,7 @@
         }
 
         resetEmpty();
-        
+
         E element = getCollection().poll();
         assertNull(element);
 
@@ -301,7 +300,7 @@
             assertTrue("poll should return correct element", success);
             verify();
         }
-        
+
         element = getCollection().poll();
         assertNull(element);
     }
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/queue/CircularFifoQueueTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/queue/CircularFifoQueueTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/queue/CircularFifoQueueTest.java	2013-11-11 21:58:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/queue/CircularFifoQueueTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -31,7 +31,6 @@
  * Test cases for CircularFifoQueue.
  *
  * @since 4.0
- * @version $Id: CircularFifoQueueTest.java 1540860 2013-11-11 21:58:27Z ebourg $
  */
 public class CircularFifoQueueTest<E> extends AbstractQueueTest<E> {
 
@@ -49,7 +48,7 @@
     public void verify() {
         super.verify();
         final Iterator<E> iterator1 = getCollection().iterator();
-        for (E e : getConfirmed()) {
+        for (final E e : getConfirmed()) {
             assertTrue(iterator1.hasNext());
             final Object o1 = iterator1.next();
             final Object o2 = e;
@@ -84,7 +83,7 @@
      */
     @Override
     public Collection<E> makeConfirmedCollection() {
-        return new ArrayList<E>();
+        return new ArrayList<>();
     }
 
     /**
@@ -106,7 +105,7 @@
      */
     @Override
     public Queue<E> makeObject() {
-        return new CircularFifoQueue<E>(100);
+        return new CircularFifoQueue<>(100);
     }
 
     //-----------------------------------------------------------------------
@@ -115,11 +114,11 @@
      */
     @SuppressWarnings("unchecked")
     public void testCircularFifoQueueCircular() {
-        final List<E> list = new ArrayList<E>();
+        final List<E> list = new ArrayList<>();
         list.add((E) "A");
         list.add((E) "B");
         list.add((E) "C");
-        final Queue<E> queue = new CircularFifoQueue<E>(list);
+        final Queue<E> queue = new CircularFifoQueue<>(list);
 
         assertEquals(true, queue.contains("A"));
         assertEquals(true, queue.contains("B"));
@@ -198,7 +197,7 @@
     @SuppressWarnings("unchecked")
     public void testRemoveError1() throws Exception {
         // based on bug 33071
-        final CircularFifoQueue<E> fifo = new CircularFifoQueue<E>(5);
+        final CircularFifoQueue<E> fifo = new CircularFifoQueue<>(5);
         fifo.add((E) "1");
         fifo.add((E) "2");
         fifo.add((E) "3");
@@ -217,7 +216,7 @@
     @SuppressWarnings("unchecked")
     public void testRemoveError2() throws Exception {
         // based on bug 33071
-        final CircularFifoQueue<E> fifo = new CircularFifoQueue<E>(5);
+        final CircularFifoQueue<E> fifo = new CircularFifoQueue<>(5);
         fifo.add((E) "1");
         fifo.add((E) "2");
         fifo.add((E) "3");
@@ -238,7 +237,7 @@
     @SuppressWarnings("unchecked")
     public void testRemoveError3() throws Exception {
         // based on bug 33071
-        final CircularFifoQueue<E> fifo = new CircularFifoQueue<E>(5);
+        final CircularFifoQueue<E> fifo = new CircularFifoQueue<>(5);
         fifo.add((E) "1");
         fifo.add((E) "2");
         fifo.add((E) "3");
@@ -261,7 +260,7 @@
     @SuppressWarnings("unchecked")
     public void testRemoveError4() throws Exception {
         // based on bug 33071
-        final CircularFifoQueue<E> fifo = new CircularFifoQueue<E>(5);
+        final CircularFifoQueue<E> fifo = new CircularFifoQueue<>(5);
         fifo.add((E) "1");
         fifo.add((E) "2");
         fifo.add((E) "3");
@@ -279,7 +278,7 @@
     @SuppressWarnings("unchecked")
     public void testRemoveError5() throws Exception {
         // based on bug 33071
-        final CircularFifoQueue<E> fifo = new CircularFifoQueue<E>(5);
+        final CircularFifoQueue<E> fifo = new CircularFifoQueue<>(5);
         fifo.add((E) "1");
         fifo.add((E) "2");
         fifo.add((E) "3");
@@ -297,7 +296,7 @@
     @SuppressWarnings("unchecked")
     public void testRemoveError6() throws Exception {
         // based on bug 33071
-        final CircularFifoQueue<E> fifo = new CircularFifoQueue<E>(5);
+        final CircularFifoQueue<E> fifo = new CircularFifoQueue<>(5);
         fifo.add((E) "1");
         fifo.add((E) "2");
         fifo.add((E) "3");
@@ -315,7 +314,7 @@
     @SuppressWarnings("unchecked")
     public void testRemoveError7() throws Exception {
         // based on bug 33071
-        final CircularFifoQueue<E> fifo = new CircularFifoQueue<E>(5);
+        final CircularFifoQueue<E> fifo = new CircularFifoQueue<>(5);
         fifo.add((E) "1");
         fifo.add((E) "2");
         fifo.add((E) "3");
@@ -333,7 +332,7 @@
     @SuppressWarnings("unchecked")
     public void testRemoveError8() throws Exception {
         // based on bug 33071
-        final CircularFifoQueue<E> fifo = new CircularFifoQueue<E>(5);
+        final CircularFifoQueue<E> fifo = new CircularFifoQueue<>(5);
         fifo.add((E) "1");
         fifo.add((E) "2");
         fifo.add((E) "3");
@@ -352,7 +351,7 @@
     @SuppressWarnings("unchecked")
     public void testRemoveError9() throws Exception {
         // based on bug 33071
-        final CircularFifoQueue<E> fifo = new CircularFifoQueue<E>(5);
+        final CircularFifoQueue<E> fifo = new CircularFifoQueue<>(5);
         fifo.add((E) "1");
         fifo.add((E) "2");
         fifo.add((E) "3");
@@ -372,7 +371,7 @@
     @SuppressWarnings("unchecked")
     public void testRepeatedSerialization() throws Exception {
         // bug 31433
-        final CircularFifoQueue<E> b = new CircularFifoQueue<E>(2);
+        final CircularFifoQueue<E> b = new CircularFifoQueue<>(2);
         b.add((E) "a");
         assertEquals(1, b.size());
         assertEquals(true, b.contains("a"));
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/queue/PredicatedQueueTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/queue/PredicatedQueueTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/queue/PredicatedQueueTest.java	2013-11-19 00:40:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/queue/PredicatedQueueTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -31,7 +31,6 @@
  * {@link PredicatedQueue} implementation.
  *
  * @since 4.0
- * @version $Id: PredicatedQueueTest.java 1543250 2013-11-19 00:40:27Z ggregory $
  */
 public class PredicatedQueueTest<E> extends AbstractQueueTest<E> {
 
@@ -54,19 +53,19 @@
 
     @Override
     public Queue<E> makeFullCollection() {
-        final Queue<E> queue = new LinkedList<E>();
+        final Queue<E> queue = new LinkedList<>();
         queue.addAll(Arrays.asList(getFullElements()));
         return decorateCollection(queue, truePredicate);
     }
 
     @Override
     public Collection<E> makeConfirmedCollection() {
-        return new LinkedList<E>();
+        return new LinkedList<>();
     }
 
     @Override
     public Collection<E> makeConfirmedFullCollection() {
-        final List<E> list = new LinkedList<E>();
+        final List<E> list = new LinkedList<>();
         list.addAll(Arrays.asList(getFullElements()));
         return list;
     }
@@ -75,6 +74,7 @@
 
     protected Predicate<E> testPredicate =
             new Predicate<E>() {
+                @Override
                 public boolean evaluate(final E o) {
                     return o instanceof String;
                 }
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/queue/SynchronizedQueueTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/queue/SynchronizedQueueTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/queue/SynchronizedQueueTest.java	1970-01-01 00:00:00.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/queue/SynchronizedQueueTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.collections4.queue;
+
+import java.util.LinkedList;
+import java.util.Queue;
+
+import org.apache.commons.collections4.BulkTest;
+import org.junit.Ignore;
+
+import junit.framework.Test;
+
+/**
+ * Extension of {@link AbstractQueueTest} for exercising the
+ * {@link SynchronizedQueue} implementation.
+ *
+ * @since 4.2
+ */
+public class SynchronizedQueueTest<T> extends AbstractQueueTest<T> {
+
+    public static Test suite() {
+        return BulkTest.makeSuite(SynchronizedQueueTest.class);
+    }
+
+    public SynchronizedQueueTest(final String testName) {
+        super(testName);
+    }
+
+    //-----------------------------------------------------------------------
+
+    @Override
+    public String getCompatibilityVersion() {
+        return "4.2";
+    }
+
+    @Override
+    public Queue<T> makeObject() {
+        return SynchronizedQueue.synchronizedQueue(new LinkedList<T>());
+    }
+
+    @Ignore("Run once")
+    public void testCreate() throws Exception {
+        Queue<T> queue = makeObject();
+        writeExternalFormToDisk((java.io.Serializable) queue, "src/test/resources/data/test/SynchronizedQueue.emptyCollection.version4.2.obj");
+        queue = makeFullCollection();
+        writeExternalFormToDisk((java.io.Serializable) queue, "src/test/resources/data/test/SynchronizedQueue.fullCollection.version4.2.obj");
+    }
+
+}
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/queue/TransformedQueueTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/queue/TransformedQueueTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/queue/TransformedQueueTest.java	2013-11-11 21:58:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/queue/TransformedQueueTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -30,7 +30,6 @@
  * {@link TransformedQueue} implementation.
  *
  * @since 4.0
- * @version $Id: TransformedQueueTest.java 1540860 2013-11-11 21:58:27Z ebourg $
  */
 public class TransformedQueueTest<E> extends AbstractQueueTest<E> {
 
@@ -41,12 +40,12 @@
     //-----------------------------------------------------------------------
     @Override
     public Queue<E> makeConfirmedCollection() {
-        return new LinkedList<E>();
+        return new LinkedList<>();
     }
 
     @Override
     public Queue<E> makeConfirmedFullCollection() {
-        final Queue<E> list = new LinkedList<E>();
+        final Queue<E> list = new LinkedList<>();
         list.addAll(Arrays.asList(getFullElements()));
         return list;
     }
@@ -61,14 +60,14 @@
     @Override
     @SuppressWarnings("unchecked")
     public Queue<E> makeFullCollection() {
-        final Queue<E> list = new LinkedList<E>();
+        final Queue<E> list = new LinkedList<>();
         list.addAll(Arrays.asList(getFullElements()));
         return TransformedQueue.transformingQueue(list, (Transformer<E, E>) TransformedCollectionTest.NOOP_TRANSFORMER);
     }
 
     //-----------------------------------------------------------------------
     public void testTransformedQueue() {
-        final Queue<Object> queue = TransformedQueue.transformingQueue(new LinkedList<Object>(),
+        final Queue<Object> queue = TransformedQueue.transformingQueue(new LinkedList<>(),
                 TransformedCollectionTest.STRING_TO_INTEGER_TRANSFORMER);
         assertEquals(0, queue.size());
         final Object[] elements = new Object[] { "1", "3", "5", "7", "2", "4", "6" };
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/queue/UnmodifiableQueueTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/queue/UnmodifiableQueueTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/queue/UnmodifiableQueueTest.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/queue/UnmodifiableQueueTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -29,7 +29,6 @@
  * {@link UnmodifiableQueue} implementation.
  *
  * @since 4.0
- * @version $Id: UnmodifiableQueueTest.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class UnmodifiableQueueTest<E> extends AbstractQueueTest<E> {
 
@@ -45,19 +44,19 @@
 
     @Override
     public Queue<E> makeFullCollection() {
-        final Queue<E> queue = new LinkedList<E>();
+        final Queue<E> queue = new LinkedList<>();
         queue.addAll(Arrays.asList(getFullElements()));
         return UnmodifiableQueue.unmodifiableQueue(queue);
     }
 
     @Override
     public Collection<E> makeConfirmedCollection() {
-        return new LinkedList<E>();
+        return new LinkedList<>();
     }
 
     @Override
     public Collection<E> makeConfirmedFullCollection() {
-        final LinkedList<E> list = new LinkedList<E>();
+        final LinkedList<E> list = new LinkedList<>();
         list.addAll(Arrays.asList(getFullElements()));
         return list;
     }
@@ -96,7 +95,7 @@
         assertTrue(makeObject() instanceof Unmodifiable);
         assertTrue(makeFullCollection() instanceof Unmodifiable);
     }
-    
+
     public void testDecorateFactory() {
         final Queue<E> queue = makeFullCollection();
         assertSame(queue, UnmodifiableQueue.unmodifiableQueue(queue));
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/QueueUtilsTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/QueueUtilsTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/QueueUtilsTest.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/QueueUtilsTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -16,21 +16,23 @@
  */
 package org.apache.commons.collections4;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.util.LinkedList;
 import java.util.Queue;
 
 import org.apache.commons.collections4.functors.TruePredicate;
 import org.apache.commons.collections4.queue.PredicatedQueue;
+import org.apache.commons.collections4.queue.SynchronizedQueue;
 import org.apache.commons.collections4.queue.TransformedQueue;
 import org.apache.commons.collections4.queue.UnmodifiableQueue;
 import org.junit.Test;
 
 /**
  * Tests for QueueUtils factory methods.
- * 
- * @version $Id: QueueUtilsTest.java 1686855 2015-06-22 13:00:27Z tn $
+ *
  */
 public class QueueUtilsTest {
 
@@ -40,8 +42,20 @@
     // ----------------------------------------------------------------------
 
     @Test
+    public void testSynchronizedQueue() {
+        final Queue<Object> queue = QueueUtils.synchronizedQueue(new LinkedList<>());
+        assertTrue("Returned object should be a SynchronizedQueue.", queue instanceof SynchronizedQueue);
+        try {
+            QueueUtils.synchronizedQueue(null);
+            fail("Expecting NullPointerException for null queue.");
+        } catch (final NullPointerException ex) {
+            // expected
+        }
+    }
+
+    @Test
     public void testUnmodifiableQueue() {
-        Queue<Object> queue = QueueUtils.unmodifiableQueue(new LinkedList<Object>());
+        final Queue<Object> queue = QueueUtils.unmodifiableQueue(new LinkedList<>());
         assertTrue("Returned object should be an UnmodifiableQueue.", queue instanceof UnmodifiableQueue);
         try {
             QueueUtils.unmodifiableQueue(null);
@@ -49,13 +63,13 @@
         } catch (final NullPointerException ex) {
             // expected
         }
-        
+
         assertSame("UnmodifiableQueue shall not be decorated", queue, QueueUtils.unmodifiableQueue(queue));
     }
 
     @Test
     public void testPredicatedQueue() {
-        Queue<Object> queue = QueueUtils.predicatedQueue(new LinkedList<Object>(), truePredicate);
+        final Queue<Object> queue = QueueUtils.predicatedQueue(new LinkedList<>(), truePredicate);
         assertTrue("Returned object should be a PredicatedQueue.", queue instanceof PredicatedQueue);
         try {
             QueueUtils.predicatedQueue(null, truePredicate);
@@ -64,7 +78,7 @@
             // expected
         }
         try {
-            QueueUtils.predicatedQueue(new LinkedList<Object>(), null);
+            QueueUtils.predicatedQueue(new LinkedList<>(), null);
             fail("Expecting NullPointerException for null predicate.");
         } catch (final NullPointerException ex) {
             // expected
@@ -73,7 +87,7 @@
 
     @Test
     public void testTransformedQueue() {
-        Queue<Object> queue = QueueUtils.transformingQueue(new LinkedList<Object>(), nopTransformer);
+        final Queue<Object> queue = QueueUtils.transformingQueue(new LinkedList<>(), nopTransformer);
         assertTrue("Returned object should be an TransformedQueue.", queue instanceof TransformedQueue);
         try {
             QueueUtils.transformingQueue(null, nopTransformer);
@@ -82,7 +96,7 @@
             // expected
         }
         try {
-            QueueUtils.transformingQueue(new LinkedList<Object>(), null);
+            QueueUtils.transformingQueue(new LinkedList<>(), null);
             fail("Expecting NullPointerException for null transformer.");
         } catch (final NullPointerException ex) {
             // expected
@@ -91,7 +105,7 @@
 
     @Test
     public void testEmptyQueue() {
-        Queue<Object> queue = QueueUtils.emptyQueue();
+        final Queue<Object> queue = QueueUtils.emptyQueue();
         assertTrue("Returned object should be an UnmodifiableQueue.", queue instanceof UnmodifiableQueue);
         assertTrue("Returned queue is not empty.", queue.isEmpty());
 
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/sequence/SequencesComparatorTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/sequence/SequencesComparatorTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/sequence/SequencesComparatorTest.java	2013-11-11 21:58:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/sequence/SequencesComparatorTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -36,7 +36,7 @@
     public void testLength() {
         for (int i = 0; i < before.size(); ++i) {
             final SequencesComparator<Character> comparator =
-                    new SequencesComparator<Character>(sequence(before.get(i)),
+                    new SequencesComparator<>(sequence(before.get(i)),
                             sequence(after.get(i)));
             Assert.assertEquals(length[i], comparator.getScript().getModifications());
         }
@@ -44,10 +44,10 @@
 
     @Test
     public void testExecution() {
-        final ExecutionVisitor<Character> ev = new ExecutionVisitor<Character>();
+        final ExecutionVisitor<Character> ev = new ExecutionVisitor<>();
         for (int i = 0; i < before.size(); ++i) {
             ev.setList(sequence(before.get(i)));
-            new SequencesComparator<Character>(sequence(before.get(i)),
+            new SequencesComparator<>(sequence(before.get(i)),
                     sequence(after.get(i))).getScript().visit(ev);
             Assert.assertEquals(after.get(i), ev.getString());
         }
@@ -61,8 +61,8 @@
             new String("ZO"),
             new String("MEU")
         };
-        final List<String> sentenceBefore = new ArrayList<String>();
-        final List<String> sentenceAfter  = new ArrayList<String>();
+        final List<String> sentenceBefore = new ArrayList<>();
+        final List<String> sentenceAfter  = new ArrayList<>();
         sentenceBefore.add(shadokAlph[0]);
         sentenceBefore.add(shadokAlph[2]);
         sentenceBefore.add(shadokAlph[3]);
@@ -99,7 +99,7 @@
             }
 
             final SequencesComparator<String> comparator =
-                    new SequencesComparator<String>(sentenceBefore, sentenceAfter);
+                    new SequencesComparator<>(sentenceBefore, sentenceAfter);
             Assert.assertTrue(comparator.getScript().getModifications() <= nbCom);
         }
     }
@@ -113,13 +113,13 @@
             new String("ZO"),
             new String("MEU")
         };
-        List<List<String>> shadokSentences = new ArrayList<List<String>>();
+        List<List<String>> shadokSentences = new ArrayList<>();
         for (int lg=0; lg<lgMax; ++lg) {
-            final List<List<String>> newTab = new ArrayList<List<String>>();
+            final List<List<String>> newTab = new ArrayList<>();
             newTab.add(new ArrayList<String>());
             for (final String element : shadokAlph) {
                 for (final List<String> sentence : shadokSentences) {
-                    final List<String> newSentence = new ArrayList<String>(sentence);
+                    final List<String> newSentence = new ArrayList<>(sentence);
                     newSentence.add(element);
                     newTab.add(newSentence);
                 }
@@ -127,12 +127,12 @@
             shadokSentences = newTab;
         }
 
-        final ExecutionVisitor<String> ev = new ExecutionVisitor<String>();
+        final ExecutionVisitor<String> ev = new ExecutionVisitor<>();
 
         for (int i = 0; i < shadokSentences.size(); ++i) {
-            for (List<String> shadokSentence : shadokSentences) {
+            for (final List<String> shadokSentence : shadokSentences) {
                 ev.setList(shadokSentences.get(i));
-                new SequencesComparator<String>(shadokSentences.get(i),
+                new SequencesComparator<>(shadokSentences.get(i),
                         shadokSentence).getScript().visit(ev);
 
                 final StringBuilder concat = new StringBuilder();
@@ -145,7 +145,7 @@
     }
 
     private List<Character> sequence(final String string) {
-        final List<Character> list = new ArrayList<Character>();
+        final List<Character> list = new ArrayList<>();
         for (int i = 0; i < string.length(); ++i) {
             list.add(new Character(string.charAt(i)));
         }
@@ -158,18 +158,21 @@
         private int index;
 
         public void setList(final List<T> array) {
-            v = new ArrayList<T>(array);
+            v = new ArrayList<>(array);
             index = 0;
         }
 
+        @Override
         public void visitInsertCommand(final T object) {
             v.add(index++, object);
         }
 
+        @Override
         public void visitKeepCommand(final T object) {
             ++index;
         }
 
+        @Override
         public void visitDeleteCommand(final T object) {
             v.remove(index);
         }
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/set/AbstractNavigableSetTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/set/AbstractNavigableSetTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/set/AbstractNavigableSetTest.java	2015-05-31 18:35:18.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/set/AbstractNavigableSetTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -31,7 +31,6 @@
  * elements may be added; see {@link AbstractSetTest} for more details.
  *
  * @since 4.1
- * @version $Id: AbstractNavigableSetTest.java 1682768 2015-05-31 18:35:18Z tn $
  */
 public abstract class AbstractNavigableSetTest<E> extends AbstractSortedSetTest<E> {
 
@@ -67,7 +66,7 @@
      */
     @Override
     public NavigableSet<E> makeConfirmedCollection() {
-        return new TreeSet<E>();
+        return new TreeSet<>();
     }
 
     //-----------------------------------------------------------------------
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/set/AbstractSetTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/set/AbstractSetTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/set/AbstractSetTest.java	2013-11-18 21:07:59.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/set/AbstractSetTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -38,7 +38,6 @@
  * elements may be added; see {@link AbstractCollectionTest} for more details.
  *
  * @since 3.0
- * @version $Id: AbstractSetTest.java 1543158 2013-11-18 21:07:59Z ggregory $
  */
 public abstract class AbstractSetTest<E> extends AbstractCollectionTest<E> {
 
@@ -63,7 +62,7 @@
         assertEquals("Sets should have equal hashCodes",
                      getConfirmed().hashCode(), getCollection().hashCode());
         final Collection<E> set = makeConfirmedCollection();
-        for (E element : getCollection()) {
+        for (final E element : getCollection()) {
             assertTrue("Set.iterator should only return unique elements", set.add(element));
         }
     }
@@ -84,7 +83,7 @@
      */
     @Override
     public Collection<E> makeConfirmedCollection() {
-        return new HashSet<E>();
+        return new HashSet<>();
     }
 
     /**
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/set/AbstractSortedSetTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/set/AbstractSortedSetTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/set/AbstractSortedSetTest.java	2015-05-31 18:35:18.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/set/AbstractSortedSetTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -31,7 +31,6 @@
  * elements may be added; see {@link AbstractSetTest} for more details.
  *
  * @since 3.0
- * @version $Id: AbstractSortedSetTest.java 1682768 2015-05-31 18:35:18Z tn $
  */
 public abstract class AbstractSortedSetTest<E> extends AbstractSetTest<E> {
 
@@ -108,7 +107,7 @@
      */
     @Override
     public SortedSet<E> makeConfirmedCollection() {
-        return new TreeSet<E>();
+        return new TreeSet<>();
     }
 
     //-----------------------------------------------------------------------
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/set/CompositeSetTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/set/CompositeSetTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/set/CompositeSetTest.java	2013-09-09 19:38:49.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/set/CompositeSetTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -28,7 +28,6 @@
  * {@link CompositeSet} implementation.
  *
  * @since 3.0
- * @version $Id: CompositeSetTest.java 1521262 2013-09-09 19:38:49Z tn $
  */
 public class CompositeSetTest<E> extends AbstractSetTest<E> {
     public CompositeSetTest(final String name) {
@@ -37,15 +36,15 @@
 
     @Override
     public CompositeSet<E> makeObject() {
-        final HashSet<E> contained = new HashSet<E>();
-        final CompositeSet<E> set = new CompositeSet<E>(contained);
-        set.setMutator( new EmptySetMutator<E>(contained) );
+        final HashSet<E> contained = new HashSet<>();
+        final CompositeSet<E> set = new CompositeSet<>(contained);
+        set.setMutator( new EmptySetMutator<>(contained) );
         return set;
     }
 
     @SuppressWarnings("unchecked")
     public Set<E> buildOne() {
-        final HashSet<E> set = new HashSet<E>();
+        final HashSet<E> set = new HashSet<>();
         set.add((E) "1");
         set.add((E) "2");
         return set;
@@ -53,7 +52,7 @@
 
     @SuppressWarnings("unchecked")
     public Set<E> buildTwo() {
-        final HashSet<E> set = new HashSet<E>();
+        final HashSet<E> set = new HashSet<>();
         set.add((E) "3");
         set.add((E) "4");
         return set;
@@ -61,7 +60,7 @@
 
     @SuppressWarnings("unchecked")
     public void testContains() {
-        final CompositeSet<E> set = new CompositeSet<E>(new Set[]{ buildOne(), buildTwo() });
+        final CompositeSet<E> set = new CompositeSet<>(new Set[]{ buildOne(), buildTwo() });
         assertTrue(set.contains("1"));
     }
 
@@ -69,7 +68,7 @@
     public void testRemoveUnderlying() {
         final Set<E> one = buildOne();
         final Set<E> two = buildTwo();
-        final CompositeSet<E> set = new CompositeSet<E>(new Set[] { one, two });
+        final CompositeSet<E> set = new CompositeSet<>(new Set[] { one, two });
         one.remove("1");
         assertFalse(set.contains("1"));
 
@@ -81,7 +80,7 @@
     public void testRemoveComposited() {
         final Set<E> one = buildOne();
         final Set<E> two = buildTwo();
-        final CompositeSet<E> set = new CompositeSet<E>(new Set[] { one, two });
+        final CompositeSet<E> set = new CompositeSet<>(new Set[] { one, two });
         set.remove("1");
         assertFalse(one.contains("1"));
 
@@ -93,27 +92,30 @@
     public void testFailedCollisionResolution() {
         final Set<E> one = buildOne();
         final Set<E> two = buildTwo();
-        final CompositeSet<E> set = new CompositeSet<E>(new Set[] { one, two });
+        final CompositeSet<E> set = new CompositeSet<>(new Set[] { one, two });
         set.setMutator(new SetMutator<E>() {
             private static final long serialVersionUID = 1L;
 
+            @Override
             public void resolveCollision(final CompositeSet<E> comp, final Set<E> existing,
                 final Set<E> added, final Collection<E> intersects) {
                 //noop
             }
 
+            @Override
             public boolean add(final CompositeSet<E> composite,
                     final List<Set<E>> collections, final E obj) {
                 throw new UnsupportedOperationException();
             }
 
+            @Override
             public boolean addAll(final CompositeSet<E> composite,
                     final List<Set<E>> collections, final Collection<? extends E> coll) {
                 throw new UnsupportedOperationException();
             }
         });
 
-        final HashSet<E> three = new HashSet<E>();
+        final HashSet<E> three = new HashSet<>();
         three.add((E) "1");
         try {
             set.addComposited(three);
@@ -128,18 +130,18 @@
     public void testAddComposited() {
         final Set<E> one = buildOne();
         final Set<E> two = buildTwo();
-        final CompositeSet<E> set = new CompositeSet<E>();
+        final CompositeSet<E> set = new CompositeSet<>();
         set.addComposited(one, two);
-        final CompositeSet<E> set2 = new CompositeSet<E>(buildOne());
+        final CompositeSet<E> set2 = new CompositeSet<>(buildOne());
         set2.addComposited(buildTwo());
         assertTrue(set.equals(set2));
-        final HashSet<E> set3 = new HashSet<E>();
+        final HashSet<E> set3 = new HashSet<>();
         set3.add((E) "1");
         set3.add((E) "2");
         set3.add((E) "3");
-        final HashSet<E> set4 = new HashSet<E>();
+        final HashSet<E> set4 = new HashSet<>();
         set4.add((E) "4");
-        final CompositeSet<E> set5 = new CompositeSet<E>(set3);
+        final CompositeSet<E> set5 = new CompositeSet<>(set3);
         set5.addComposited(set4);
         assertTrue(set.equals(set5));
         try {
@@ -152,13 +154,13 @@
 
     @SuppressWarnings("unchecked")
     public void testAddCompositedCollision() {
-        final HashSet<E> set1 = new HashSet<E>();
+        final HashSet<E> set1 = new HashSet<>();
         set1.add((E) "1");
         set1.add((E) "2");
         set1.add((E) "3");
-        final HashSet<E> set2 = new HashSet<E>();
+        final HashSet<E> set2 = new HashSet<>();
         set2.add((E) "4");
-        final CompositeSet<E> set3 = new CompositeSet<E>(set1);
+        final CompositeSet<E> set3 = new CompositeSet<>(set1);
         try {
             set3.addComposited(set1, buildOne());
             fail("Expecting UnsupportedOperationException.");
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/set/EmptySetMutator.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/set/EmptySetMutator.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/set/EmptySetMutator.java	2013-04-30 14:27:35.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/set/EmptySetMutator.java	2018-07-08 00:18:18.000000000 +0000
@@ -36,14 +36,17 @@
         this.contained = set;
     }
 
+    @Override
     public void resolveCollision(final CompositeSet<E> comp, final Set<E> existing, final Set<E> added, final Collection<E> intersects) {
         throw new IllegalArgumentException();
     }
 
+    @Override
     public boolean add(final CompositeSet<E> composite, final List<Set<E>> collections, final E obj) {
         return contained.add(obj);
     }
 
+    @Override
     public boolean addAll(final CompositeSet<E> composite, final List<Set<E>> collections, final Collection<? extends E> coll) {
         return contained.addAll(coll);
     }
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/set/ListOrderedSet2Test.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/set/ListOrderedSet2Test.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/set/ListOrderedSet2Test.java	2013-04-28 23:15:54.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/set/ListOrderedSet2Test.java	2018-07-08 00:18:18.000000000 +0000
@@ -25,7 +25,6 @@
  * implementation.
  *
  * @since 3.1
- * @version $Id: ListOrderedSet2Test.java 1476855 2013-04-28 23:15:54Z sebb $
  */
 public class ListOrderedSet2Test<E> extends AbstractSetTest<E> {
 
@@ -40,7 +39,7 @@
 
     @Override
     public ListOrderedSet<E> makeObject() {
-        return new ListOrderedSet<E>();
+        return new ListOrderedSet<>();
     }
 
     @SuppressWarnings("unchecked")
@@ -134,7 +133,7 @@
         assertSame(ONE, set.get(1));
         assertSame(TWO, set.get(2));
 
-        final List<E> list = new ArrayList<E>();
+        final List<E> list = new ArrayList<>();
         list.add((E) ZERO);
         list.add((E) TWO);
 
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/set/ListOrderedSetTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/set/ListOrderedSetTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/set/ListOrderedSetTest.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/set/ListOrderedSetTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -28,9 +28,8 @@
 /**
  * Extension of {@link AbstractSetTest} for exercising the
  * {@link ListOrderedSet} implementation.
- * 
+ *
  * @since 3.0
- * @version $Id: ListOrderedSetTest.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class ListOrderedSetTest<E>
     extends AbstractSetTest<E> {
@@ -145,7 +144,7 @@
         assertSame(ONE, set.get(1));
         assertSame(TWO, set.get(2));
 
-        final List<E> list = new ArrayList<E>();
+        final List<E> list = new ArrayList<>();
         list.add((E) ZERO);
         list.add((E) TWO);
 
@@ -182,14 +181,14 @@
 
     @SuppressWarnings("unchecked")
     public void testRetainAll() {
-        final List<E> list = new ArrayList<E>(10);
-        final Set<E> set = new HashSet<E>(10);
+        final List<E> list = new ArrayList<>(10);
+        final Set<E> set = new HashSet<>(10);
         final ListOrderedSet<E> orderedSet = ListOrderedSet.listOrderedSet(set, list);
         for (int i = 0; i < 10; ++i) {
             orderedSet.add((E) Integer.valueOf(10 - i - 1));
         }
 
-        final Collection<E> retained = new ArrayList<E>(5);
+        final Collection<E> retained = new ArrayList<>(5);
         for (int i = 0; i < 5; ++i) {
             retained.add((E) Integer.valueOf(i * 2));
         }
@@ -206,7 +205,7 @@
 
     @SuppressWarnings("unchecked")
     public void testDuplicates() {
-        final List<E> list = new ArrayList<E>(10);
+        final List<E> list = new ArrayList<>(10);
         list.add((E) Integer.valueOf(1));
         list.add((E) Integer.valueOf(2));
         list.add((E) Integer.valueOf(3));
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/set/MapBackedSet2Test.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/set/MapBackedSet2Test.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/set/MapBackedSet2Test.java	2013-04-17 17:37:03.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/set/MapBackedSet2Test.java	2018-07-08 00:18:18.000000000 +0000
@@ -25,7 +25,6 @@
  * JUnit test.
  *
  * @since 3.1
- * @version $Id: MapBackedSet2Test.java 1469004 2013-04-17 17:37:03Z tn $
  */
 public class MapBackedSet2Test<E> extends AbstractSetTest<E> {
 
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/set/MapBackedSetTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/set/MapBackedSetTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/set/MapBackedSetTest.java	2013-04-17 17:56:22.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/set/MapBackedSetTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -24,7 +24,6 @@
  * JUnit test.
  *
  * @since 3.1
- * @version $Id: MapBackedSetTest.java 1469009 2013-04-17 17:56:22Z tn $
  */
 public class MapBackedSetTest<E> extends AbstractSetTest<E> {
 
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/set/PredicatedNavigableSetTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/set/PredicatedNavigableSetTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/set/PredicatedNavigableSetTest.java	2015-05-31 18:35:18.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/set/PredicatedNavigableSetTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -33,7 +33,6 @@
  * {@link PredicatedNavigableSet} implementation.
  *
  * @since 4.1
- * @version $Id: PredicatedNavigableSetTest.java 1682768 2015-05-31 18:35:18Z tn $
  */
 public class PredicatedNavigableSetTest<E> extends AbstractNavigableSetTest<E> {
 
@@ -56,7 +55,7 @@
 
     @Override
     public NavigableSet<E> makeFullCollection() {
-        final TreeSet<E> set = new TreeSet<E>();
+        final TreeSet<E> set = new TreeSet<>();
         set.addAll(Arrays.asList(getFullElements()));
         return PredicatedNavigableSet.predicatedNavigableSet(set, truePredicate);
     }
@@ -64,6 +63,7 @@
 //--------------------------------------------------------------------
     protected Predicate<E> testPredicate =
         new Predicate<E>() {
+            @Override
             public boolean evaluate(final E o) {
                 return o instanceof String && ((String) o).startsWith("A");
             }
@@ -95,7 +95,7 @@
     @SuppressWarnings("unchecked")
     public void testIllegalAddAll() {
         final NavigableSet<E> set = makeTestSet();
-        final Set<E> elements = new TreeSet<E>();
+        final Set<E> elements = new TreeSet<>();
         elements.add((E) "Aone");
         elements.add((E) "Atwo");
         elements.add((E) "Bthree");
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/set/PredicatedSetTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/set/PredicatedSetTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/set/PredicatedSetTest.java	2013-04-28 23:15:54.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/set/PredicatedSetTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -23,11 +23,10 @@
 import org.apache.commons.collections4.functors.TruePredicate;
 
 /**
- * Extension of {@link AbstractSetTest} for exercising the 
+ * Extension of {@link AbstractSetTest} for exercising the
  * {@link PredicatedSet} implementation.
  *
  * @since 3.0
- * @version $Id: PredicatedSetTest.java 1476855 2013-04-28 23:15:54Z sebb $
  */
 public class PredicatedSetTest<E> extends AbstractSetTest<E> {
 
@@ -58,6 +57,7 @@
 
     protected Predicate<E> testPredicate =
         new Predicate<E>() {
+            @Override
             public boolean evaluate(final E o) {
                 return o instanceof String;
             }
@@ -89,7 +89,7 @@
     @SuppressWarnings("unchecked")
     public void testIllegalAddAll() {
         final Set<E> set = makeTestSet();
-        final Set<E> elements = new HashSet<E>();
+        final Set<E> elements = new HashSet<>();
         elements.add((E) "one");
         elements.add((E) "two");
         elements.add((E) Integer.valueOf(3));
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/set/PredicatedSortedSetTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/set/PredicatedSortedSetTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/set/PredicatedSortedSetTest.java	2013-04-21 17:51:33.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/set/PredicatedSortedSetTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -33,7 +33,6 @@
  * {@link PredicatedSortedSet} implementation.
  *
  * @since 3.0
- * @version $Id: PredicatedSortedSetTest.java 1470323 2013-04-21 17:51:33Z tn $
  */
 public class PredicatedSortedSetTest<E> extends AbstractSortedSetTest<E> {
 
@@ -56,7 +55,7 @@
 
     @Override
     public SortedSet<E> makeFullCollection() {
-        final TreeSet<E> set = new TreeSet<E>();
+        final TreeSet<E> set = new TreeSet<>();
         set.addAll(Arrays.asList(getFullElements()));
         return PredicatedSortedSet.predicatedSortedSet(set, truePredicate);
     }
@@ -64,6 +63,7 @@
 //--------------------------------------------------------------------
     protected Predicate<E> testPredicate =
         new Predicate<E>() {
+            @Override
             public boolean evaluate(final E o) {
                 return o instanceof String && ((String) o).startsWith("A");
             }
@@ -95,7 +95,7 @@
     @SuppressWarnings("unchecked")
     public void testIllegalAddAll() {
         final SortedSet<E> set = makeTestSet();
-        final Set<E> elements = new TreeSet<E>();
+        final Set<E> elements = new TreeSet<>();
         elements.add((E) "Aone");
         elements.add((E) "Atwo");
         elements.add((E) "Bthree");
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/set/TransformedNavigableSetTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/set/TransformedNavigableSetTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/set/TransformedNavigableSetTest.java	2015-05-31 18:35:18.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/set/TransformedNavigableSetTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -33,7 +33,6 @@
  * {@link TransformedNavigableSet} implementation.
  *
  * @since 4.1
- * @version $Id: TransformedNavigableSetTest.java 1682768 2015-05-31 18:35:18Z tn $
  */
 public class TransformedNavigableSetTest<E> extends AbstractNavigableSetTest<E> {
 
@@ -56,7 +55,7 @@
     @Override
     @SuppressWarnings("unchecked")
     public NavigableSet<E> makeFullCollection() {
-        final NavigableSet<E> set = new TreeSet<E>();
+        final NavigableSet<E> set = new TreeSet<>();
         set.addAll(Arrays.asList(getFullElements()));
         return TransformedNavigableSet.transformingNavigableSet(set,
                 (Transformer<E, E>) TransformedCollectionTest.NOOP_TRANSFORMER);
@@ -79,7 +78,7 @@
     }
 
     public void testTransformedSet_decorateTransform() {
-        final Set<Object> originalSet = new TreeSet<Object>();
+        final Set<Object> originalSet = new TreeSet<>();
         final Object[] els = new Object[] {"1", "3", "5", "7", "2", "4", "6"};
         Collections.addAll(originalSet, els);
         final Set<?> set = TransformedSet.transformedSet(originalSet,
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/set/TransformedSetTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/set/TransformedSetTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/set/TransformedSetTest.java	2013-11-11 21:58:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/set/TransformedSetTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -29,7 +29,6 @@
  * implementation.
  *
  * @since 3.0
- * @version $Id: TransformedSetTest.java 1540860 2013-11-11 21:58:27Z ebourg $
  */
 public class TransformedSetTest<E> extends AbstractSetTest<E> {
 
@@ -39,12 +38,12 @@
 
     @Override
     public Set<E> makeConfirmedCollection() {
-        return new HashSet<E>();
+        return new HashSet<>();
     }
 
     @Override
     public Set<E> makeConfirmedFullCollection() {
-        final Set<E> set = new HashSet<E>();
+        final Set<E> set = new HashSet<>();
         set.addAll(Arrays.asList(getFullElements()));
         return set;
     }
@@ -59,7 +58,7 @@
     @Override
     @SuppressWarnings("unchecked")
     public Set<E> makeFullCollection() {
-        final Set<E> list = new HashSet<E>();
+        final Set<E> list = new HashSet<>();
         list.addAll(Arrays.asList(getFullElements()));
         return TransformedSet.transformingSet(list,
                 (Transformer<E, E>) TransformedCollectionTest.NOOP_TRANSFORMER);
@@ -84,7 +83,7 @@
     }
 
     public void testTransformedSet_decorateTransform() {
-        final Set<Object> originalSet = new HashSet<Object>();
+        final Set<Object> originalSet = new HashSet<>();
         final Object[] els = new Object[] {"1", "3", "5", "7", "2", "4", "6"};
         Collections.addAll(originalSet, els);
         final Set<?> set = TransformedSet.transformedSet(originalSet, TransformedCollectionTest.STRING_TO_INTEGER_TRANSFORMER);
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/set/TransformedSortedSetTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/set/TransformedSortedSetTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/set/TransformedSortedSetTest.java	2014-10-30 00:22:49.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/set/TransformedSortedSetTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -33,7 +33,6 @@
  * implementation.
  *
  * @since 3.0
- * @version $Id: TransformedSortedSetTest.java 1635353 2014-10-30 00:22:49Z ggregory $
  */
 public class TransformedSortedSetTest<E> extends AbstractSortedSetTest<E> {
 
@@ -55,7 +54,7 @@
     @Override
     @SuppressWarnings("unchecked")
     public SortedSet<E> makeFullCollection() {
-        final SortedSet<E> set = new TreeSet<E>();
+        final SortedSet<E> set = new TreeSet<>();
         set.addAll(Arrays.asList(getFullElements()));
         return TransformedSortedSet.transformingSortedSet(set, (Transformer<E, E>) TransformedCollectionTest.NOOP_TRANSFORMER);
     }
@@ -77,7 +76,7 @@
     }
 
     public void testTransformedSet_decorateTransform() {
-        final Set<Object> originalSet = new TreeSet<Object>();
+        final Set<Object> originalSet = new TreeSet<>();
         final Object[] els = new Object[] {"1", "3", "5", "7", "2", "4", "6"};
         Collections.addAll(originalSet, els);
         final Set<?> set = TransformedSet.transformedSet(originalSet, TransformedCollectionTest.STRING_TO_INTEGER_TRANSFORMER);
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/set/UnmodifiableNavigableSetTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/set/UnmodifiableNavigableSetTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/set/UnmodifiableNavigableSetTest.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/set/UnmodifiableNavigableSetTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -32,7 +32,6 @@
  * {@link UnmodifiableNavigableSet} implementation.
  *
  * @since 4.1
- * @version $Id: UnmodifiableNavigableSetTest.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class UnmodifiableNavigableSetTest<E> extends AbstractNavigableSetTest<E> {
     protected UnmodifiableNavigableSet<E> set = null;
@@ -54,7 +53,7 @@
 
     @Override
     public UnmodifiableNavigableSet<E> makeFullCollection() {
-        final TreeSet<E> set = new TreeSet<E>();
+        final TreeSet<E> set = new TreeSet<>();
         set.addAll(Arrays.asList(getFullElements()));
         return (UnmodifiableNavigableSet<E>) UnmodifiableNavigableSet.unmodifiableNavigableSet(set);
     }
@@ -73,7 +72,7 @@
     @SuppressWarnings("unchecked")
     protected void setupSet() {
         set = makeFullCollection();
-        array = new ArrayList<E>();
+        array = new ArrayList<>();
         array.add((E) Integer.valueOf(1));
     }
 
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/set/UnmodifiableSetTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/set/UnmodifiableSetTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/set/UnmodifiableSetTest.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/set/UnmodifiableSetTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -30,7 +30,6 @@
  * {@link UnmodifiableSet} implementation.
  *
  * @since 3.0
- * @version $Id: UnmodifiableSetTest.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class UnmodifiableSetTest<E> extends AbstractSetTest<E> {
 
@@ -50,7 +49,7 @@
 
     @Override
     public Set<E> makeFullCollection() {
-        final HashSet<E> set = new HashSet<E>();
+        final HashSet<E> set = new HashSet<>();
         set.addAll(Arrays.asList(getFullElements()));
         return UnmodifiableSet.unmodifiableSet(set);
     }
@@ -71,7 +70,7 @@
         assertTrue(makeObject() instanceof Unmodifiable);
         assertTrue(makeFullCollection() instanceof Unmodifiable);
     }
-    
+
     public void testDecorateFactory() {
         final Set<E> set = makeFullCollection();
         assertSame(set, UnmodifiableSet.unmodifiableSet(set));
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/set/UnmodifiableSortedSetTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/set/UnmodifiableSortedSetTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/set/UnmodifiableSortedSetTest.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/set/UnmodifiableSortedSetTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -32,7 +32,6 @@
  * {@link UnmodifiableSortedSet} implementation.
  *
  * @since 3.0
- * @version $Id: UnmodifiableSortedSetTest.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class UnmodifiableSortedSetTest<E> extends AbstractSortedSetTest<E> {
     protected UnmodifiableSortedSet<E> set = null;
@@ -54,7 +53,7 @@
 
     @Override
     public UnmodifiableSortedSet<E> makeFullCollection() {
-        final TreeSet<E> set = new TreeSet<E>();
+        final TreeSet<E> set = new TreeSet<>();
         set.addAll(Arrays.asList(getFullElements()));
         return (UnmodifiableSortedSet<E>) UnmodifiableSortedSet.unmodifiableSortedSet(set);
     }
@@ -73,7 +72,7 @@
     @SuppressWarnings("unchecked")
     protected void setupSet() {
         set = makeFullCollection();
-        array = new ArrayList<E>();
+        array = new ArrayList<>();
         array.add((E) Integer.valueOf(1));
     }
 
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/SetUtilsTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/SetUtilsTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/SetUtilsTest.java	2015-06-22 21:49:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/SetUtilsTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -35,7 +35,6 @@
 /**
  * Tests for SetUtils.
  *
- * @version $Id: SetUtilsTest.java 1686948 2015-06-22 21:49:27Z tn $
  */
 public class SetUtilsTest {
 
@@ -44,14 +43,14 @@
 
     @Before
     public void setUp() {
-        setA = new HashSet<Integer>();
+        setA = new HashSet<>();
         setA.add(1);
         setA.add(2);
         setA.add(3);
         setA.add(4);
         setA.add(5);
 
-        setB = new HashSet<Integer>();
+        setB = new HashSet<>();
         setB.add(3);
         setB.add(4);
         setB.add(5);
@@ -69,10 +68,10 @@
                 return o instanceof String;
             }
         };
-        Set<Object> set = SetUtils.predicatedSet(new HashSet<Object>(), predicate);
+        final Set<Object> set = SetUtils.predicatedSet(new HashSet<>(), predicate);
         assertTrue("returned object should be a PredicatedSet", set instanceof PredicatedSet);
         try {
-            SetUtils.predicatedSet(new HashSet<Object>(), null);
+            SetUtils.predicatedSet(new HashSet<>(), null);
             fail("Expecting NullPointerException for null predicate.");
         } catch (final NullPointerException ex) {
             // expected
@@ -89,7 +88,7 @@
     public void testEmptyIfNull() {
         assertTrue(SetUtils.emptyIfNull(null).isEmpty());
 
-        final Set<Long> set = new HashSet<Long>();
+        final Set<Long> set = new HashSet<>();
         assertSame(set, SetUtils.emptyIfNull(set));
     }
 
@@ -97,8 +96,8 @@
     public void testEquals() {
         final Collection<String> data = Arrays.asList("a", "b", "c");
 
-        final Set<String> a = new HashSet<String>(data);
-        final Set<String> b = new HashSet<String>(data);
+        final Set<String> a = new HashSet<>(data);
+        final Set<String> b = new HashSet<>(data);
 
         assertEquals(true, a.equals(b));
         assertEquals(true, SetUtils.isEqualSet(a, b));
@@ -113,8 +112,8 @@
     public void testHashCode() {
         final Collection<String> data = Arrays.asList("a", "b", "c");
 
-        final Set<String> a = new HashSet<String>(data);
-        final Set<String> b = new HashSet<String>(data);
+        final Set<String> a = new HashSet<>(data);
+        final Set<String> b = new HashSet<>(data);
 
         assertEquals(true, a.hashCode() == b.hashCode());
         assertEquals(true, a.hashCode() == SetUtils.hashCodeForSet(a));
@@ -127,17 +126,17 @@
 
     @Test
     public void testNewIdentityHashSet() {
-        Set<String> set = SetUtils.newIdentityHashSet();
-        String a = new String("a");
+        final Set<String> set = SetUtils.newIdentityHashSet();
+        final String a = new String("a");
         set.add(a);
         set.add(new String("b"));
         set.add(a);
-        
+
         assertEquals(2, set.size());
-        
+
         set.add(new String("a"));
         assertEquals(3, set.size());
-        
+
         set.remove(a);
         assertEquals(2, set.size());
     }
@@ -155,14 +154,14 @@
         try {
             SetUtils.union(setA, null);
             fail("Expecting NullPointerException");
-        } catch (NullPointerException npe) {
+        } catch (final NullPointerException npe) {
             // expected
         }
 
         try {
             SetUtils.union(null, setA);
             fail("Expecting NullPointerException");
-        } catch (NullPointerException npe) {
+        } catch (final NullPointerException npe) {
             // expected
         }
     }
@@ -173,7 +172,7 @@
         assertEquals(2, set.size());
         assertTrue(set.contains(1));
         assertTrue(set.contains(2));
-        for (Integer i : setB) {
+        for (final Integer i : setB) {
             assertFalse(set.contains(i));
         }
 
@@ -183,14 +182,14 @@
         try {
             SetUtils.difference(setA, null);
             fail("Expecting NullPointerException");
-        } catch (NullPointerException npe) {
+        } catch (final NullPointerException npe) {
             // expected
         }
 
         try {
             SetUtils.difference(null, setA);
             fail("Expecting NullPointerException");
-        } catch (NullPointerException npe) {
+        } catch (final NullPointerException npe) {
             // expected
         }
     }
@@ -213,14 +212,14 @@
         try {
             SetUtils.intersection(setA, null);
             fail("Expecting NullPointerException");
-        } catch (NullPointerException npe) {
+        } catch (final NullPointerException npe) {
             // expected
         }
 
         try {
             SetUtils.intersection(null, setA);
             fail("Expecting NullPointerException");
-        } catch (NullPointerException npe) {
+        } catch (final NullPointerException npe) {
             // expected
         }
     }
@@ -243,14 +242,14 @@
         try {
             SetUtils.disjunction(setA, null);
             fail("Expecting NullPointerException");
-        } catch (NullPointerException npe) {
+        } catch (final NullPointerException npe) {
             // expected
         }
 
         try {
             SetUtils.disjunction(null, setA);
             fail("Expecting NullPointerException");
-        } catch (NullPointerException npe) {
+        } catch (final NullPointerException npe) {
             // expected
         }
     }
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/splitmap/TransformedSplitMapTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/splitmap/TransformedSplitMapTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/splitmap/TransformedSplitMapTest.java	2013-11-11 13:01:13.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/splitmap/TransformedSplitMapTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -31,24 +31,26 @@
  * Tests for {@link TransformedSplitMap}
  *
  * @since 4.0
- * @version $Id: TransformedSplitMapTest.java 1540695 2013-11-11 13:01:13Z ebourg $
  */
 @SuppressWarnings("boxing")
 public class TransformedSplitMapTest extends BulkTest {
 
     private final Transformer<Integer, String> intToString = new Transformer<Integer, String>() {
+        @Override
         public String transform(final Integer input) {
             return String.valueOf(input);
         }
     };
 
     private final Transformer<Object, Class<?>> objectToClass = new Transformer<Object, Class<?>>() {
+        @Override
         public java.lang.Class<?> transform(final Object input) {
             return input == null ? null : input.getClass();
         }
     };
 
     private final Transformer<String, Integer> stringToInt = new Transformer<String, Integer>() {
+        @Override
         public Integer transform(final String input) {
             return Integer.valueOf(input);
         }
@@ -64,7 +66,7 @@
                 new HashMap<String, Class<?>>(), intToString, objectToClass);
 
         final Integer[] k = new Integer[] { 0, 1, 2, 3, 4, 5, 6 };
-        final Object[] v = new Object[] { "", new Object(), new HashMap<Object, Object>(), 0, BigInteger.TEN, null,
+        final Object[] v = new Object[] { "", new Object(), new HashMap<>(), 0, BigInteger.TEN, null,
                 new Object[0] };
 
         assertEquals(0, map.size());
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/SplitMapUtilsTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/SplitMapUtilsTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/SplitMapUtilsTest.java	2015-06-01 21:54:51.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/SplitMapUtilsTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -35,7 +35,6 @@
  * Tests for {@link TransformedSplitMap}
  *
  * @since 4.0
- * @version $Id: SplitMapUtilsTest.java 1683010 2015-06-01 21:54:51Z tn $
  */
 @SuppressWarnings("boxing")
 public class SplitMapUtilsTest {
@@ -43,6 +42,7 @@
     private TransformedSplitMap<String, String, String, Integer> transformedMap;
 
     private final Transformer<String, Integer> stringToInt = new Transformer<String, Integer>() {
+        @Override
         public Integer transform(final String input) {
             return Integer.valueOf(input);
         }
@@ -50,7 +50,7 @@
 
     @Before
     public void setUp() throws Exception {
-        backingMap = new HashMap<String, Integer>();
+        backingMap = new HashMap<>();
         transformedMap = TransformedSplitMap.transformingMap(backingMap, NOPTransformer.<String> nopTransformer(),
                 stringToInt);
         for (int i = 0; i < 10; i++) {
@@ -85,6 +85,7 @@
         int sz = map.size();
 
         attemptPutOperation(new Runnable() {
+            @Override
             public void run() {
                 map.clear();
             }
@@ -93,16 +94,18 @@
         assertEquals(sz, map.size());
 
         attemptPutOperation(new Runnable() {
+            @Override
             public void run() {
                 map.put("foo", 100);
             }
         });
 
-        final HashMap<String, Integer> m = new HashMap<String, Integer>();
+        final HashMap<String, Integer> m = new HashMap<>();
         m.put("foo", 100);
         m.put("bar", 200);
         m.put("baz", 300);
         attemptPutOperation(new Runnable() {
+            @Override
             public void run() {
                 map.putAll(m);
             }
@@ -124,7 +127,7 @@
 
     @Test
     public void testAlreadyReadableMap() {
-        final HashedMap<String, Integer> hashedMap = new HashedMap<String, Integer>();
+        final HashedMap<String, Integer> hashedMap = new HashedMap<>();
         assertSame(hashedMap, SplitMapUtils.readableMap(hashedMap));
     }
 
@@ -133,46 +136,55 @@
     public void testWritableMap() {
         final Map<String, String> map = SplitMapUtils.writableMap(transformedMap);
         attemptGetOperation(new Runnable() {
+            @Override
             public void run() {
                 map.get(null);
             }
         });
         attemptGetOperation(new Runnable() {
+            @Override
             public void run() {
                 map.entrySet();
             }
         });
         attemptGetOperation(new Runnable() {
+            @Override
             public void run() {
                 map.keySet();
             }
         });
         attemptGetOperation(new Runnable() {
+            @Override
             public void run() {
                 map.values();
             }
         });
         attemptGetOperation(new Runnable() {
+            @Override
             public void run() {
                 map.size();
             }
         });
         attemptGetOperation(new Runnable() {
+            @Override
             public void run() {
                 map.isEmpty();
             }
         });
         attemptGetOperation(new Runnable() {
+            @Override
             public void run() {
                 map.containsKey(null);
             }
         });
         attemptGetOperation(new Runnable() {
+            @Override
             public void run() {
                 map.containsValue(null);
             }
         });
         attemptGetOperation(new Runnable() {
+            @Override
             public void run() {
                 map.remove(null);
             }
@@ -190,7 +202,7 @@
         assertEquals(++sz, backingMap.size());
 
         // putall
-        final Map<String, String> more = new HashMap<String, String>();
+        final Map<String, String> more = new HashMap<>();
         more.put("foo", "77");
         more.put("bar", "88");
         more.put("baz", "99");
@@ -205,7 +217,7 @@
 
     @Test
     public void testAlreadyWritableMap() {
-        final HashedMap<String, String> hashedMap = new HashedMap<String, String>();
+        final HashedMap<String, String> hashedMap = new HashedMap<>();
         assertSame(hashedMap, SplitMapUtils.writableMap(hashedMap));
     }
 
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/TransformerUtilsTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/TransformerUtilsTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/TransformerUtilsTest.java	2015-11-14 13:24:24.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/TransformerUtilsTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -42,7 +42,6 @@
  * Tests the TransformerUtils class.
  *
  * @since 3.0
- * @version $Id: TransformerUtilsTest.java 1714318 2015-11-14 13:24:24Z tn $
  */
 public class TransformerUtilsTest {
 
@@ -129,7 +128,7 @@
     @Test
     @SuppressWarnings("boxing") // OK in test code
     public void testMapTransformer() {
-        final Map<Object, Integer> map = new HashMap<Object, Integer>();
+        final Map<Object, Integer> map = new HashMap<>();
         map.put(null, 0);
         map.put(cObject, 1);
         map.put(cString, 2);
@@ -203,7 +202,7 @@
         assertEquals("A", TransformerUtils.chainedTransformer(b, a).transform(null));
         assertEquals("B", TransformerUtils.chainedTransformer(a, b).transform(null));
         assertEquals("A", TransformerUtils.chainedTransformer(new Transformer[] { b, a }).transform(null));
-        Collection<Transformer<Object, Object>> coll = new ArrayList<Transformer<Object, Object>>();
+        Collection<Transformer<Object, Object>> coll = new ArrayList<>();
         coll.add(b);
         coll.add(a);
         assertEquals("A", TransformerUtils.chainedTransformer(coll).transform(null));
@@ -228,7 +227,7 @@
             fail();
         } catch (final NullPointerException ex) {}
         try {
-            coll = new ArrayList<Transformer<Object, Object>>();
+            coll = new ArrayList<>();
             coll.add(null);
             coll.add(null);
             TransformerUtils.chainedTransformer(coll);
@@ -248,18 +247,18 @@
         assertEquals("A", TransformerUtils.ifTransformer(TruePredicate.truePredicate(), a, b).transform(null));
         assertEquals("B", TransformerUtils.ifTransformer(FalsePredicate.falsePredicate(), a, b).transform(null));
 
-        Predicate<Integer> lessThanFivePredicate = new Predicate<Integer>() {
+        final Predicate<Integer> lessThanFivePredicate = new Predicate<Integer>() {
             @Override
-            public boolean evaluate(Integer value) {
+            public boolean evaluate(final Integer value) {
                 return value < 5;
             }
         };
         // if/else tests
         assertEquals("A", TransformerUtils.<Integer, String>ifTransformer(lessThanFivePredicate, a, b).transform(1));
         assertEquals("B", TransformerUtils.<Integer, String>ifTransformer(lessThanFivePredicate, a, b).transform(5));
-        
+
         // if tests
-        Predicate<String> equalsAPredicate = EqualPredicate.equalPredicate("A");
+        final Predicate<String> equalsAPredicate = EqualPredicate.equalPredicate("A");
         assertEquals("C", TransformerUtils.<String>ifTransformer(equalsAPredicate, c).transform("A"));
         assertEquals("B", TransformerUtils.<String>ifTransformer(equalsAPredicate, c).transform("B"));
 
@@ -280,7 +279,7 @@
             fail();
         } catch (final NullPointerException ex) {}
     }
-    
+
     // switchTransformer
     //------------------------------------------------------------------
 
@@ -308,7 +307,7 @@
             new Predicate[] { EqualPredicate.equalPredicate("HELLO"), EqualPredicate.equalPredicate("THERE") },
             new Transformer[] { a, b }, c).transform("WELL"));
 
-        Map<Predicate<String>, Transformer<String, String>> map = new HashMap<Predicate<String>, Transformer<String,String>>();
+        Map<Predicate<String>, Transformer<String, String>> map = new HashMap<>();
         map.put(EqualPredicate.equalPredicate("HELLO"), a);
         map.put(EqualPredicate.equalPredicate("THERE"), b);
         assertEquals(null, TransformerUtils.switchTransformer(map).transform("WELL"));
@@ -319,7 +318,7 @@
 
         assertEquals(ConstantTransformer.NULL_INSTANCE, TransformerUtils.switchTransformer(new Predicate[0], new Transformer[0]));
         assertEquals(ConstantTransformer.NULL_INSTANCE, TransformerUtils.switchTransformer(new HashMap<Predicate<Object>, Transformer<Object, Object>>()));
-        map = new HashMap<Predicate<String>, Transformer<String, String>>();
+        map = new HashMap<>();
         map.put(null, null);
         assertEquals(ConstantTransformer.NULL_INSTANCE, TransformerUtils.switchTransformer(map));
 
@@ -356,7 +355,7 @@
         final Transformer<String, String> b = TransformerUtils.constantTransformer("B");
         final Transformer<String, String> c = TransformerUtils.constantTransformer("C");
 
-        Map<String, Transformer<String, String>> map = new HashMap<String, Transformer<String,String>>();
+        Map<String, Transformer<String, String>> map = new HashMap<>();
         map.put("HELLO", a);
         map.put("THERE", b);
         assertEquals(null, TransformerUtils.switchMapTransformer(map).transform("WELL"));
@@ -366,7 +365,7 @@
         assertEquals("C", TransformerUtils.switchMapTransformer(map).transform("WELL"));
 
         assertSame(ConstantTransformer.NULL_INSTANCE, TransformerUtils.switchMapTransformer(new HashMap<Object, Transformer<Object, Object>>()));
-        map = new HashMap<String, Transformer<String, String>>();
+        map = new HashMap<>();
         map.put(null, null);
         assertSame(ConstantTransformer.NULL_INSTANCE, TransformerUtils.switchMapTransformer(map));
 
@@ -381,7 +380,7 @@
 
     @Test
     public void testInvokerTransformer() {
-        final List<Object> list = new ArrayList<Object>();
+        final List<Object> list = new ArrayList<>();
         assertEquals(Integer.valueOf(0), TransformerUtils.invokerTransformer("size").transform(list));
         list.add(new Object());
         assertEquals(Integer.valueOf(1), TransformerUtils.invokerTransformer("size").transform(list));
@@ -402,7 +401,7 @@
 
     @Test
     public void testInvokerTransformer2() {
-        final List<Object> list = new ArrayList<Object>();
+        final List<Object> list = new ArrayList<>();
         assertEquals(Boolean.FALSE, TransformerUtils.invokerTransformer("contains",
                 new Class[] { Object.class }, new Object[] { cString }).transform(list));
         list.add(cString);
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/trie/PatriciaTrie2Test.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/trie/PatriciaTrie2Test.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/trie/PatriciaTrie2Test.java	2013-06-13 21:01:00.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/trie/PatriciaTrie2Test.java	2018-07-08 00:18:18.000000000 +0000
@@ -26,7 +26,6 @@
  * JUnit test of the OrderedMap interface of a PatriciaTrie.
  *
  * @since 4.0
- * @version $Id: PatriciaTrie2Test.java 1492866 2013-06-13 21:01:00Z tn $
  */
 public class PatriciaTrie2Test<V> extends AbstractOrderedMapTest<String, V> {
 
@@ -40,7 +39,7 @@
 
     @Override
     public OrderedMap<String, V> makeObject() {
-        return new PatriciaTrie<V>();
+        return new PatriciaTrie<>();
     }
 
     @Override
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/trie/PatriciaTrieTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/trie/PatriciaTrieTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/trie/PatriciaTrieTest.java	2015-09-28 09:42:00.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/trie/PatriciaTrieTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -16,15 +16,20 @@
  */
 package org.apache.commons.collections4.trie;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.ConcurrentModificationException;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.NoSuchElementException;
+import java.util.Set;
 import java.util.SortedMap;
 
 import junit.framework.Test;
 
 import org.apache.commons.collections4.BulkTest;
+import org.apache.commons.collections4.Trie;
 import org.apache.commons.collections4.map.AbstractSortedMapTest;
 import org.junit.Assert;
 
@@ -32,7 +37,6 @@
  * JUnit tests for the PatriciaTrie.
  *
  * @since 4.0
- * @version $Id: PatriciaTrieTest.java 1705637 2015-09-28 09:42:00Z tn $
  */
 public class PatriciaTrieTest<V> extends AbstractSortedMapTest<String, V> {
 
@@ -46,7 +50,7 @@
 
     @Override
     public SortedMap<String, V> makeObject() {
-        return new PatriciaTrie<V>();
+        return new PatriciaTrie<>();
     }
 
     @Override
@@ -57,7 +61,7 @@
     //-----------------------------------------------------------------------
 
     public void testPrefixMap() {
-        final PatriciaTrie<String> trie = new PatriciaTrie<String>();
+        final PatriciaTrie<String> trie = new PatriciaTrie<>();
 
         final String[] keys = new String[]{
                 "",
@@ -284,7 +288,7 @@
     }
 
     public void testPrefixMapRemoval() {
-        final PatriciaTrie<String> trie = new PatriciaTrie<String>();
+        final PatriciaTrie<String> trie = new PatriciaTrie<>();
 
         final String[] keys = new String[]{
                 "Albert", "Xavier", "XyZ", "Anna", "Alien", "Alberto",
@@ -327,7 +331,7 @@
 
     public void testPrefixMapSizes() {
         // COLLECTIONS-525
-        PatriciaTrie<String> aTree = new PatriciaTrie<String>();
+        final PatriciaTrie<String> aTree = new PatriciaTrie<>();
         aTree.put("点评", "测试");
         aTree.put("书评", "测试");
         assertTrue(aTree.prefixMap("点").containsKey("点评"));
@@ -349,7 +353,7 @@
         final char u8000 = Character.toChars(32768)[0]; // U+8000 (1000000000000000)
         final char char_b = 'b'; // 1100010
 
-        final PatriciaTrie<String> trie = new PatriciaTrie<String>();
+        final PatriciaTrie<String> trie = new PatriciaTrie<>();
         final String prefixString = "" + char_b;
         final String longerString = prefixString + u8000;
 
@@ -365,6 +369,64 @@
         assertTrue(trie.prefixMap(prefixString).containsKey(longerString));
     }
 
+    public void testPrefixMapClear() {
+        final Trie<String, Integer> trie = new PatriciaTrie<>();
+        trie.put("Anna", 1);
+        trie.put("Anael", 2);
+        trie.put("Analu", 3);
+        trie.put("Andreas", 4);
+        trie.put("Andrea", 5);
+        trie.put("Andres", 6);
+        trie.put("Anatole", 7);
+        final SortedMap<String, Integer> prefixMap = trie.prefixMap("And");
+        assertEquals(new HashSet<>(Arrays.asList("Andrea", "Andreas", "Andres")), prefixMap.keySet());
+        assertEquals(Arrays.asList(5, 4, 6), new ArrayList<>(prefixMap.values()));
+
+        prefixMap.clear();
+        assertTrue(prefixMap.isEmpty());
+        assertTrue(prefixMap.keySet().isEmpty());
+        assertTrue(prefixMap.values().isEmpty());
+        assertEquals(new HashSet<>(Arrays.asList("Anael", "Analu", "Anatole", "Anna")), trie.keySet());
+        assertEquals(Arrays.asList(2, 3, 7, 1), new ArrayList<>(trie.values()));
+    }
+
+    public void testPrefixMapClearNothing() {
+        final Trie<String, Integer> trie = new PatriciaTrie<>();
+        final SortedMap<String, Integer> prefixMap = trie.prefixMap("And");
+        assertEquals(new HashSet<String>(), prefixMap.keySet());
+        assertEquals(new ArrayList<Integer>(0), new ArrayList<>(prefixMap.values()));
+
+        prefixMap.clear();
+        assertTrue(prefixMap.isEmpty());
+        assertTrue(prefixMap.keySet().isEmpty());
+        assertTrue(prefixMap.values().isEmpty());
+        assertEquals(new HashSet<String>(), trie.keySet());
+        assertEquals(new ArrayList<Integer>(0), new ArrayList<>(trie.values()));
+    }
+
+    public void testPrefixMapClearUsingRemove() {
+        final Trie<String, Integer> trie = new PatriciaTrie<>();
+        trie.put("Anna", 1);
+        trie.put("Anael", 2);
+        trie.put("Analu", 3);
+        trie.put("Andreas", 4);
+        trie.put("Andrea", 5);
+        trie.put("Andres", 6);
+        trie.put("Anatole", 7);
+        final SortedMap<String, Integer> prefixMap = trie.prefixMap("And");
+        assertEquals(new HashSet<>(Arrays.asList("Andrea", "Andreas", "Andres")), prefixMap.keySet());
+        assertEquals(Arrays.asList(5, 4, 6), new ArrayList<>(prefixMap.values()));
+
+        final Set<String> keys = new HashSet<>(prefixMap.keySet());
+        for (final String key : keys) {
+            prefixMap.remove(key);
+        }
+        assertTrue(prefixMap.keySet().isEmpty());
+        assertTrue(prefixMap.values().isEmpty());
+        assertEquals(new HashSet<>(Arrays.asList("Anael", "Analu", "Anatole", "Anna")), trie.keySet());
+        assertEquals(Arrays.asList(2, 3, 7, 1), new ArrayList<>(trie.values()));
+    }
+
     //-----------------------------------------------------------------------
 
     @Override
@@ -381,5 +443,5 @@
 //        writeExternalFormToDisk(
 //            (java.io.Serializable) map,
 //            "src/test/resources/data/test/PatriciaTrie.fullCollection.version4.obj");
-//    }    
+//    }
 }
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/trie/UnmodifiableTrieTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/trie/UnmodifiableTrieTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/trie/UnmodifiableTrieTest.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/trie/UnmodifiableTrieTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -28,7 +28,6 @@
  * {@link UnmodifiableTrie} implementation.
  *
  * @since 4.0
- * @version $Id: UnmodifiableTrieTest.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class UnmodifiableTrieTest<V> extends AbstractSortedMapTest<String, V> {
 
@@ -64,7 +63,7 @@
 
     @Override
     public Trie<String, V> makeFullMap() {
-        final Trie<String, V> m = new PatriciaTrie<V>();
+        final Trie<String, V> m = new PatriciaTrie<>();
         addSampleMappings(m);
         return UnmodifiableTrie.unmodifiableTrie(m);
     }
diff -Nru libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/TrieUtilsTest.java libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/TrieUtilsTest.java
--- libcommons-collections4-java-4.1/src/test/java/org/apache/commons/collections4/TrieUtilsTest.java	2015-06-22 13:00:27.000000000 +0000
+++ libcommons-collections4-java-4.2/src/test/java/org/apache/commons/collections4/TrieUtilsTest.java	2018-07-08 00:18:18.000000000 +0000
@@ -25,7 +25,6 @@
 /**
  * Tests for TrieUtils factory methods.
  *
- * @version $Id: TrieUtilsTest.java 1686855 2015-06-22 13:00:27Z tn $
  */
 public class TrieUtilsTest {
 
@@ -33,7 +32,7 @@
 
     @Test
     public void testUnmodifiableTrie() {
-        Trie<String, Object> trie = TrieUtils.unmodifiableTrie(new PatriciaTrie<Object>());
+        final Trie<String, Object> trie = TrieUtils.unmodifiableTrie(new PatriciaTrie<>());
         assertTrue("Returned object should be an UnmodifiableTrie.",
             trie instanceof UnmodifiableTrie);
         try {
@@ -42,7 +41,7 @@
         } catch (final NullPointerException ex) {
             // expected
         }
-        
+
         assertSame("UnmodifiableTrie shall not be decorated", trie, TrieUtils.unmodifiableTrie(trie));
     }
 
Binary files /tmp/tmpHbkh4W/LY3kS442Lb/libcommons-collections4-java-4.1/src/test/resources/data/test/SynchronizedQueue.emptyCollection.version4.2.obj and /tmp/tmpHbkh4W/Ekj3_TAY4E/libcommons-collections4-java-4.2/src/test/resources/data/test/SynchronizedQueue.emptyCollection.version4.2.obj differ
Binary files /tmp/tmpHbkh4W/LY3kS442Lb/libcommons-collections4-java-4.1/src/test/resources/data/test/SynchronizedQueue.fullCollection.version4.2.obj and /tmp/tmpHbkh4W/Ekj3_TAY4E/libcommons-collections4-java-4.2/src/test/resources/data/test/SynchronizedQueue.fullCollection.version4.2.obj differ
diff -Nru libcommons-collections4-java-4.1/.travis.yml libcommons-collections4-java-4.2/.travis.yml
--- libcommons-collections4-java-4.1/.travis.yml	2015-11-24 09:25:40.000000000 +0000
+++ libcommons-collections4-java-4.2/.travis.yml	2018-07-08 00:18:18.000000000 +0000
@@ -1,10 +1,28 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 language: java
 sudo: false
 
 jdk:
-  - openjdk6
   - openjdk7
   - oraclejdk8
+  - oraclejdk9
+
+script:
+  - mvn
 
 after_success:
-  - mvn clean test jacoco:report coveralls:report
+  - mvn clean test jacoco:report coveralls:report -Ptravis-jacoco
\ No newline at end of file