From c81eb91d7b9aa9728dfc83d68a881b4e2a0fa8d2 Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Thu, 29 Aug 2019 13:58:24 +0200
Subject: [PATCH 2/4] Port to hamcrest 2.1

---
 .../src/main/java/org/xmlunit/matchers/CompareMatcher.java   | 3 ---
 .../main/java/org/xmlunit/matchers/EvaluateXPathMatcher.java | 2 --
 .../src/main/java/org/xmlunit/matchers/HasXPathMatcher.java  | 2 --
 .../src/main/java/org/xmlunit/matchers/TypeMatcher.java      | 5 -----
 .../main/java/org/xmlunit/matchers/ValidationMatcher.java    | 3 ---
 5 files changed, 15 deletions(-)

diff --git a/xmlunit-matchers/src/main/java/org/xmlunit/matchers/CompareMatcher.java b/xmlunit-matchers/src/main/java/org/xmlunit/matchers/CompareMatcher.java
index 6452081..226399c 100644
--- a/xmlunit-matchers/src/main/java/org/xmlunit/matchers/CompareMatcher.java
+++ b/xmlunit-matchers/src/main/java/org/xmlunit/matchers/CompareMatcher.java
@@ -33,7 +33,6 @@ import org.xmlunit.util.Predicate;
 
 import org.hamcrest.BaseMatcher;
 import org.hamcrest.Description;
-import org.hamcrest.Factory;
 import org.hamcrest.Matcher;
 
 import java.lang.reflect.Constructor;
@@ -112,7 +111,6 @@ public final class CompareMatcher extends BaseMatcher<Object>
      * <p>
      * As input all types are supported which are supported by {@link Input#from(Object)}.
      */
-    @Factory
     public static CompareMatcher isIdenticalTo(final Object control) {
         return new CompareMatcher(control).checkForIdentical();
     }
@@ -128,7 +126,6 @@ public final class CompareMatcher extends BaseMatcher<Object>
      * <p>
      * As input all types are supported which are supported by {@link Input#from(Object)}.
      */
-    @Factory
     public static CompareMatcher isSimilarTo(final Object control) {
         return new CompareMatcher(control).checkForSimilar();
     }
diff --git a/xmlunit-matchers/src/main/java/org/xmlunit/matchers/EvaluateXPathMatcher.java b/xmlunit-matchers/src/main/java/org/xmlunit/matchers/EvaluateXPathMatcher.java
index 6eb23e5..1e9b8b5 100644
--- a/xmlunit-matchers/src/main/java/org/xmlunit/matchers/EvaluateXPathMatcher.java
+++ b/xmlunit-matchers/src/main/java/org/xmlunit/matchers/EvaluateXPathMatcher.java
@@ -16,7 +16,6 @@ package org.xmlunit.matchers;
 
 import org.hamcrest.BaseMatcher;
 import org.hamcrest.Description;
-import org.hamcrest.Factory;
 import org.hamcrest.Matcher;
 import org.w3c.dom.Node;
 import org.xmlunit.builder.Input;
@@ -93,7 +92,6 @@ public class EvaluateXPathMatcher extends BaseMatcher<Object> {
      * @param valueMatcher matcher for the value at the specified xpath
      * @return the xpath matcher
      */
-    @Factory
     public static EvaluateXPathMatcher hasXPath(String xPath, Matcher<String> valueMatcher) {
         return new EvaluateXPathMatcher(xPath, valueMatcher);
     }
diff --git a/xmlunit-matchers/src/main/java/org/xmlunit/matchers/HasXPathMatcher.java b/xmlunit-matchers/src/main/java/org/xmlunit/matchers/HasXPathMatcher.java
index 08325cd..6fbf0ac 100644
--- a/xmlunit-matchers/src/main/java/org/xmlunit/matchers/HasXPathMatcher.java
+++ b/xmlunit-matchers/src/main/java/org/xmlunit/matchers/HasXPathMatcher.java
@@ -16,7 +16,6 @@ package org.xmlunit.matchers;
 
 import org.hamcrest.BaseMatcher;
 import org.hamcrest.Description;
-import org.hamcrest.Factory;
 import org.hamcrest.Matcher;
 import org.w3c.dom.Node;
 import org.xmlunit.builder.Input;
@@ -135,7 +134,6 @@ public class HasXPathMatcher extends BaseMatcher<Object> {
      * @param xPath the target xpath
      * @return the xpath matcher
      */
-    @Factory
     public static HasXPathMatcher hasXPath(String xPath) {
         return new HasXPathMatcher(xPath);
     }
diff --git a/xmlunit-matchers/src/main/java/org/xmlunit/matchers/TypeMatcher.java b/xmlunit-matchers/src/main/java/org/xmlunit/matchers/TypeMatcher.java
index b9002a1..7cd6843 100644
--- a/xmlunit-matchers/src/main/java/org/xmlunit/matchers/TypeMatcher.java
+++ b/xmlunit-matchers/src/main/java/org/xmlunit/matchers/TypeMatcher.java
@@ -15,7 +15,6 @@
 package org.xmlunit.matchers;
 
 import org.hamcrest.Description;
-import org.hamcrest.Factory;
 import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeMatcher;
 
@@ -128,7 +127,6 @@ public abstract class TypeMatcher<T> extends TypeSafeMatcher<String> {
      * @param valueMatcher valueMatcher for the converted value
      * @return the BigDecimal matcher
      */
-    @Factory
     public static TypeMatcher<BigDecimal> asBigDecimal(Matcher<? extends BigDecimal> valueMatcher) {
         return new BigDecimalTypeMatcher(valueMatcher);
     }
@@ -146,7 +144,6 @@ public abstract class TypeMatcher<T> extends TypeSafeMatcher<String> {
      * @param valueMatcher valueMatcher for the converted value
      * @return the Double matcher
      */
-    @Factory
     public static TypeMatcher<Double> asDouble(Matcher<? extends Double> valueMatcher) {
         return new DoubleTypeMatcher(valueMatcher);
     }
@@ -164,7 +161,6 @@ public abstract class TypeMatcher<T> extends TypeSafeMatcher<String> {
      * @param valueMatcher valueMatcher for the converted value
      * @return the Integer matcher
      */
-    @Factory
     public static TypeMatcher<Integer> asInt(Matcher<? extends Integer> valueMatcher) {
         return new IntegerTypeMatcher(valueMatcher);
     }
@@ -182,7 +178,6 @@ public abstract class TypeMatcher<T> extends TypeSafeMatcher<String> {
      * @param valueMatcher valueMatcher for the converted value
      * @return the Boolean matcher
      */
-    @Factory
     public static TypeMatcher<Boolean> asBoolean(Matcher<? extends Boolean> valueMatcher) {
         return new BooleanTypeMatcher(valueMatcher);
     }
diff --git a/xmlunit-matchers/src/main/java/org/xmlunit/matchers/ValidationMatcher.java b/xmlunit-matchers/src/main/java/org/xmlunit/matchers/ValidationMatcher.java
index 3126349..51f58ec 100644
--- a/xmlunit-matchers/src/main/java/org/xmlunit/matchers/ValidationMatcher.java
+++ b/xmlunit-matchers/src/main/java/org/xmlunit/matchers/ValidationMatcher.java
@@ -27,7 +27,6 @@ import org.xmlunit.validation.ValidationProblem;
 import org.xmlunit.validation.ValidationResult;
 import org.hamcrest.BaseMatcher;
 import org.hamcrest.Description;
-import org.hamcrest.Factory;
 
 import javax.xml.transform.Source;
 import javax.xml.validation.Schema;
@@ -121,7 +120,6 @@ public class ValidationMatcher extends BaseMatcher {
         }
     }
 
-    @Factory
     public static ValidationMatcher valid(final Object schemaSource) {
         return new ValidationMatcher(schemaSource);
     }
@@ -129,7 +127,6 @@ public class ValidationMatcher extends BaseMatcher {
     /**
      * @since XMLUnit 2.3.0
      */
-    @Factory
     public static ValidationMatcher valid(final Schema schema) {
         return new ValidationMatcher(schema);
     }
-- 
2.21.0