Rename GenericFilter<T> to Filter<T>

junit-team · Jan 22, 2016 · abd3f38 · abd3f38
1 parent 08bf642
commit abd3f38
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 11 deletions.
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
@@ -26,7 +26,7 @@
  * @see EngineDiscoveryRequest
  * @see TestEngine
  */
-public interface DiscoveryFilter<T> extends GenericFilter<T> {
+public interface DiscoveryFilter<T> extends Filter<T> {
 
 	/**
 	 * Combines an array of {@code DiscoveryFilters} into a new filter that will

diff --git a/.../org/junit/gen5/engine/GenericFilter.java → ...in/java/org/junit/gen5/engine/Filter.java b/.../org/junit/gen5/engine/GenericFilter.java → ...in/java/org/junit/gen5/engine/Filter.java
@@ -20,7 +20,7 @@
  * @see DiscoveryFilter
  */
 @FunctionalInterface
-public interface GenericFilter<T> {
+public interface Filter<T> {
 
 	FilterResult filter(T object);
 

diff --git a/junit-engine-api/src/main/java/org/junit/gen5/engine/FilterResult.java b/junit-engine-api/src/main/java/org/junit/gen5/engine/FilterResult.java
@@ -16,7 +16,7 @@
 import org.junit.gen5.commons.util.ToStringBuilder;
 
 /**
- * The result of evaluating a {@link GenericFilter}.
+ * The result of evaluating a {@link Filter}.
  *
  * @since 5.0
  */

diff --git a/junit-launcher/src/main/java/org/junit/gen5/launcher/EngineIdFilter.java b/junit-launcher/src/main/java/org/junit/gen5/launcher/EngineIdFilter.java
@@ -12,8 +12,8 @@
 
 import static org.junit.gen5.engine.FilterResult.includedIf;
 
+import org.junit.gen5.engine.Filter;
 import org.junit.gen5.engine.FilterResult;
-import org.junit.gen5.engine.GenericFilter;
 import org.junit.gen5.engine.TestEngine;
 
 /**
@@ -24,7 +24,7 @@
  * @since 5.0
  * @see TestDiscoveryRequest
  */
-public class EngineIdFilter implements GenericFilter<String> {
+public class EngineIdFilter implements Filter<String> {
 
 	public static EngineIdFilter byEngineId(String engineId) {
 		return new EngineIdFilter(engineId);

diff --git a/junit-launcher/src/main/java/org/junit/gen5/launcher/PostDiscoveryFilter.java b/junit-launcher/src/main/java/org/junit/gen5/launcher/PostDiscoveryFilter.java
@@ -10,7 +10,7 @@
 
 package org.junit.gen5.launcher;
 
-import org.junit.gen5.engine.GenericFilter;
+import org.junit.gen5.engine.Filter;
 import org.junit.gen5.engine.TestDescriptor;
 import org.junit.gen5.engine.TestEngine;
 
@@ -23,5 +23,5 @@
  * @see TestDiscoveryRequest
  * @see TestEngine
  */
-public interface PostDiscoveryFilter extends GenericFilter<TestDescriptor> {
+public interface PostDiscoveryFilter extends Filter<TestDescriptor> {
 }
diff --git a/junit-launcher/src/main/java/org/junit/gen5/launcher/main/TestDiscoveryRequestBuilder.java b/junit-launcher/src/main/java/org/junit/gen5/launcher/main/TestDiscoveryRequestBuilder.java
@@ -16,8 +16,10 @@
 
 import org.junit.gen5.engine.DiscoveryFilter;
 import org.junit.gen5.engine.DiscoverySelector;
-import org.junit.gen5.engine.GenericFilter;
+import org.junit.gen5.engine.Filter;
-import org.junit.gen5.launcher.*;
+import org.junit.gen5.launcher.EngineIdFilter;
+import org.junit.gen5.launcher.PostDiscoveryFilter;
+import org.junit.gen5.launcher.TestDiscoveryRequest;
 
 /**
  * The {@code DiscoveryRequestBuilder} provides a light-weight DSL for
@@ -73,14 +75,14 @@ public TestDiscoveryRequestBuilder select(List<DiscoverySelector> elements) {
 		return this;
 	}
 
-	public TestDiscoveryRequestBuilder filter(GenericFilter<?>... filters) {
+	public TestDiscoveryRequestBuilder filter(Filter<?>... filters) {
 		if (filters != null) {
 			Arrays.stream(filters).forEach(this::storeFilter);
 		}
 		return this;
 	}
 
-	private void storeFilter(GenericFilter<?> filter) {
+	private void storeFilter(Filter<?> filter) {
 		if (filter instanceof EngineIdFilter) {
 			this.engineIdFilters.add((EngineIdFilter) filter);
 		}