1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
|
Description: Fixes the type inference errors when building with the source/target level set to Java 8
Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: not-needed
--- a/libhamcrest-java/hamcrest/src/main/java/org/hamcrest/core/AllOf.java
+++ b/libhamcrest-java/hamcrest/src/main/java/org/hamcrest/core/AllOf.java
@@ -46,7 +46,7 @@
* <pre>assertThat("myValue", allOf(startsWith("my"), containsString("Val")))</pre>
*/
public static <T> Matcher<T> allOf(Iterable<Matcher<? super T>> matchers) {
- return new AllOf<>(matchers);
+ return new AllOf<>((java.util.List) matchers);
}
/**
@@ -56,6 +56,6 @@
*/
@SafeVarargs
public static <T> Matcher<T> allOf(Matcher<? super T>... matchers) {
- return allOf(Arrays.asList(matchers));
+ return allOf((java.util.List) Arrays.asList(matchers));
}
}
--- a/libhamcrest-java/hamcrest/src/main/java/org/hamcrest/core/AnyOf.java
+++ b/libhamcrest-java/hamcrest/src/main/java/org/hamcrest/core/AnyOf.java
@@ -36,7 +36,7 @@
* <pre>assertThat("myValue", anyOf(startsWith("foo"), containsString("Val")))</pre>
*/
public static <T> AnyOf<T> anyOf(Iterable<Matcher<? super T>> matchers) {
- return new AnyOf<>(matchers);
+ return new AnyOf<>((java.util.List) matchers);
}
/**
@@ -46,6 +46,6 @@
*/
@SafeVarargs
public static <T> AnyOf<T> anyOf(Matcher<? super T>... matchers) {
- return anyOf(Arrays.asList(matchers));
+ return anyOf((java.util.List) Arrays.asList(matchers));
}
}
--- a/libhamcrest-java/hamcrest/src/main/java/org/hamcrest/collection/ArrayMatching.java
+++ b/libhamcrest-java/hamcrest/src/main/java/org/hamcrest/collection/ArrayMatching.java
@@ -67,7 +67,7 @@
*/
@SafeVarargs
public static <E> Matcher<E[]> arrayContainingInAnyOrder(Matcher<? super E>... itemMatchers) {
- return arrayContainingInAnyOrder(asList(itemMatchers));
+ return arrayContainingInAnyOrder((List) asList(itemMatchers));
}
/**
--- a/libhamcrest-java/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java
+++ b/libhamcrest-java/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java
@@ -98,7 +98,7 @@
*/
@SafeVarargs
public static <T> Matcher<Iterable<? extends T>> containsInAnyOrder(Matcher<? super T>... itemMatchers) {
- return containsInAnyOrder(Arrays.asList(itemMatchers));
+ return containsInAnyOrder((List) Arrays.asList(itemMatchers));
}
/**
--- a/libhamcrest-java/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java
+++ b/libhamcrest-java/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java
@@ -73,7 +73,7 @@
* the matchers that must be satisfied by the items in the examined array
*/
public static <E> Matcher<E[]> arrayContaining(Matcher<? super E>... itemMatchers) {
- return arrayContaining(asList(itemMatchers));
+ return arrayContaining((List) asList(itemMatchers));
}
/**
--- a/libhamcrest-java/hamcrest/src/main/java/org/hamcrest/core/CombinableMatcher.java
+++ b/libhamcrest-java/hamcrest/src/main/java/org/hamcrest/core/CombinableMatcher.java
@@ -57,7 +57,7 @@
this.first = matcher;
}
public CombinableMatcher<X> and(Matcher<? super X> other) {
- return new CombinableMatcher<>(first).and(other);
+ return new CombinableMatcher<>(first).and((Matcher) other);
}
}
@@ -76,7 +76,7 @@
this.first = matcher;
}
public CombinableMatcher<X> or(Matcher<? super X> other) {
- return new CombinableMatcher<>(first).or(other);
+ return new CombinableMatcher<>(first).or((Matcher) other);
}
}
}
--- a/libhamcrest-java/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java
+++ b/libhamcrest-java/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java
@@ -99,7 +99,7 @@
*/
@SafeVarargs
public static <E> Matcher<Iterable<? extends E>> containsInRelativeOrder(Matcher<? super E>... itemMatchers) {
- return containsInRelativeOrder(asList(itemMatchers));
+ return containsInRelativeOrder((List) asList(itemMatchers));
}
/**
--- a/libhamcrest-java/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java
+++ b/libhamcrest-java/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java
@@ -59,7 +59,7 @@
* a list of matchers, each of which must be satisfied by an entry in an examined array
*/
public static <E> Matcher<E[]> arrayContainingInAnyOrder(Matcher<? super E>... itemMatchers) {
- return arrayContainingInAnyOrder(Arrays.asList(itemMatchers));
+ return arrayContainingInAnyOrder((List) Arrays.asList(itemMatchers));
}
/**
|
