fix: contains/containsInAnyOrder overloading issue

.github/workflows/ci.yaml

@@ -3,24 +3,56 @@ name: Java CI
 
 on: [push]
 
+concurrency:
+  group: ${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
+  build:
+    name: Build Default Java/OS
+    runs-on: ubuntu-18.04
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK
+        uses: actions/setup-java@v1
+        with:
+          java-version: 7
+      - name: Gradle Clean Build
+        run: ./gradlew clean build
+
   test:
+    name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
+    needs: build
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-18.04, ubuntu-20.04]
         java: [7, 8, 11, 17, 18-ea, 19-ea]
+        exclude:
+          - os: ubuntu-18.04
+            java: 7
       fail-fast: false
       max-parallel: 4
-    name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
 
     steps:
       - uses: actions/checkout@v2
       - name: Set up JDK
         uses: actions/setup-java@v1
         with:
           java-version: ${{ matrix.java }}
-      - name: Build with Gradle
-        run: ./gradlew clean build javadoc
+      - name: Gradle Clean Build
+        run: ./gradlew clean build
+  qa:
+    name: QA Steps
+    needs: test
+    runs-on: ubuntu-18.04
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK
+        uses: actions/setup-java@v1
+        with:
+          java-version: 7
+      - name: Gradle JavaDoc
+        run: ./gradlew javadoc
 
 ...

hamcrest-integration/src/main/java/org/hamcrest/JMock1Matchers.java

@@ -9,4 +9,5 @@ public class JMock1Matchers {
     public static Constraint equalTo(String string) {
         return JMock1Adapter.adapt(IsEqual.equalTo(string));
     }
+
 }

hamcrest-integration/src/main/java/org/hamcrest/JavaLangMatcherAssert.java

@@ -10,9 +10,11 @@
  * @author Neil Dunn
  */
 public class JavaLangMatcherAssert {
+
     private JavaLangMatcherAssert() {};
 
     public static <T> boolean that(T argument, Matcher<? super T> matcher) {
         return matcher.matches(argument);
     }
+
 }

hamcrest-integration/src/main/java/org/hamcrest/integration/EasyMock2Adapter.java

@@ -19,6 +19,8 @@ public class EasyMock2Adapter implements IArgumentMatcher {
      * EasyMock {@link org.easymock.IArgumentMatcher} and
      * report it to EasyMock so it can be kept track of.
      *
+     * @param matcher
+     *     the matcher to adapt to EasyMock constraint.
      * @return The EasyMock matcher.
      */
     public static IArgumentMatcher adapt(Matcher<?> matcher) {
@@ -42,4 +44,5 @@ public boolean matches(Object argument) {
     public void appendTo(StringBuffer buffer) {
         hamcrestMatcher.describeTo(new StringDescription(buffer));
     }
+
 }

hamcrest-integration/src/main/java/org/hamcrest/integration/JMock1Adapter.java

@@ -19,6 +19,8 @@ public class JMock1Adapter implements Constraint {
      * Hamcrest {@link org.hamcrest.Matcher} to act as an
      * jMock {@link org.jmock.core.Constraint}.
      *
+     * @param matcher
+     *     the matcher to adapt to jMock constraint.
      * @return The jMock constraint.
      */
     public static Constraint adapt(Matcher<?> matcher) {
@@ -41,4 +43,5 @@ public StringBuffer describeTo(StringBuffer buffer) {
         hamcrestMatcher.describeTo(new StringDescription(buffer));
         return buffer;
     }
+
 }

hamcrest/src/main/java/org/hamcrest/BaseDescription.java

@@ -18,13 +18,13 @@ public Description appendText(String text) {
         append(text);
         return this;
     }
-    
+
     @Override
     public Description appendDescriptionOf(SelfDescribing value) {
         value.describeTo(this);
         return this;
     }
-    
+
     @Override
     public Description appendValue(Object value) {
         if (value == null) {
@@ -75,48 +75,54 @@ private String descriptionOf(Object value) {
     public final <T> Description appendValueList(String start, String separator, String end, T... values) {
         return appendValueList(start, separator, end, Arrays.asList(values));
     }
-    
+
     @Override
     public <T> Description appendValueList(String start, String separator, String end, Iterable<T> values) {
         return appendValueList(start, separator, end, values.iterator());
     }
-    
+
     private <T> Description appendValueList(String start, String separator, String end, Iterator<T> values) {
         return appendList(start, separator, end, new SelfDescribingValueIterator<>(values));
     }
-    
+
     @Override
     public Description appendList(String start, String separator, String end, Iterable<? extends SelfDescribing> values) {
         return appendList(start, separator, end, values.iterator());
     }
 
     private Description appendList(String start, String separator, String end, Iterator<? extends SelfDescribing> i) {
         boolean separate = false;
-        
+
         append(start);
         while (i.hasNext()) {
             if (separate) append(separator);
             appendDescriptionOf(i.next());
             separate = true;
         }
         append(end);
-        
+
         return this;
     }
 
     /**
-     * Append the String <var>str</var> to the description.  
-     * The default implementation passes every character to {@link #append(char)}.  
+     * Append the String <var>str</var> to the description.
+     * The default implementation passes every character to {@link #append(char)}.
      * Override in subclasses to provide an efficient implementation.
+     *
+     * @param str
+     *     the string to append.
      */
     protected void append(String str) {
         for (int i = 0; i < str.length(); i++) {
             append(str.charAt(i));
         }
     }
-    
+
     /**
-     * Append the char <var>c</var> to the description.  
+     * Append the char <var>c</var> to the description.
+     *
+     * @param c
+     *     the char to append.
      */
     protected abstract void append(char c);
 
@@ -149,4 +155,5 @@ private void toJavaSyntax(char ch) {
                 append(ch);
         }
     }
+
 }

hamcrest/src/main/java/org/hamcrest/BaseMatcher.java

@@ -39,4 +39,5 @@ protected static boolean isNotNull(Object actual, Description mismatch) {
         }
         return true;
     }
+
 }

hamcrest/src/main/java/org/hamcrest/Condition.java

@@ -9,9 +9,9 @@
  * Based on https://github.com/npryce/maybe-java
  * @author Steve Freeman 2012 http://www.hamcrest.com
  */
-
 public abstract class Condition<T> {
-    public static final NotMatched<Object> NOT_MATCHED = new NotMatched<Object>();
+
+    public static final NotMatched<Object> NOT_MATCHED = new NotMatched<>();
 
     public interface Step<I, O> {
         Condition<O> apply(I value, Description mismatch);
@@ -31,7 +31,7 @@ public static <T> Condition<T> notMatched() {
     }
 
     public static <T> Condition<T> matched(final T theValue, final Description mismatch) {
-        return new Matched<T>(theValue, mismatch);
+        return new Matched<>(theValue, mismatch);
     }
 
     private static final class Matched<T> extends Condition<T> {
@@ -66,4 +66,5 @@ private static final class NotMatched<T> extends Condition<T> {
             return notMatched();
         }
     }
+
 }