Make DiscoveryFilter.combine() usable for subinterfaces, e.g. ClassFi…

…lter
junit-team · Jan 24, 2016 · 5d54648 · 5d54648
1 parent b7f8241
commit 5d54648
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/junit-engine-api/src/main/java/org/junit/gen5/engine/CombinedDiscoveryFilter.java b/junit-engine-api/src/main/java/org/junit/gen5/engine/CombinedDiscoveryFilter.java
@@ -31,9 +31,9 @@ static <T> DiscoveryFilter<T> alwaysIncluded() {
 		return ALWAYS_INCLUDED_DISCOVERY_FILTER;
 	}
 
-	private final Collection<DiscoveryFilter<T>> filters;
+	private final Collection<? extends DiscoveryFilter<T>> filters;
 
-	public CombinedDiscoveryFilter(Collection<DiscoveryFilter<T>> filters) {
+	public CombinedDiscoveryFilter(Collection<? extends DiscoveryFilter<T>> filters) {
 		this.filters = filters;
 	}
 

diff --git a/junit-engine-api/src/main/java/org/junit/gen5/engine/DiscoveryFilter.java b/junit-engine-api/src/main/java/org/junit/gen5/engine/DiscoveryFilter.java
@@ -58,7 +58,7 @@ public static <T> DiscoveryFilter<T> combine(DiscoveryFilter<T>... filters) {
 	 * <p>If the size of the collection is 1, this method will return the filter
 	 * contained in the collection.
 	 */
-	public static <T> DiscoveryFilter<T> combine(Collection<DiscoveryFilter<T>> filters) {
+	public static <T> DiscoveryFilter<T> combine(Collection<? extends DiscoveryFilter<T>> filters) {
 		if (filters == null || filters.isEmpty()) {
 			return alwaysIncluded();
 		}