Match if empty by default in InstanceFilter and ExceptionTypeFilter

Prior to this commit, the constructors for InstanceFilter and
ExceptionTypeFilter required one to supply the matchIfEmpty flag.
However, users will typically want that to be true. Moreover, we always
supply true for the matchIfEmpty flag within the Spring Framework.

This commit therefore makes the matchIfEmpty flag optional by
introducing overloaded constructors for InstanceFilter and
ExceptionTypeFilter that only accept the includes and excludes
collections.

In addition, this commit overhauls the Javadoc for InstanceFilter and
ExceptionTypeFilter, fixing several issues in the documentation.

Furthermore, this commit applies consistent @⁠Nullable declarations
in ExceptionTypeFilter.

Closes gh-35158

spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/AbstractJCacheOperation.java

@@ -134,7 +134,7 @@ abstract class AbstractJCacheOperation<A extends Annotation> implements JCacheOp
 	protected ExceptionTypeFilter createExceptionTypeFilter(
 			Class<? extends Throwable>[] includes, Class<? extends Throwable>[] excludes) {
 
-		return new ExceptionTypeFilter(Arrays.asList(includes), Arrays.asList(excludes), true);
+		return new ExceptionTypeFilter(Arrays.asList(includes), Arrays.asList(excludes));
 	}
 
 

spring-context/src/main/java/org/springframework/resilience/retry/MethodRetrySpec.java

@@ -64,7 +64,7 @@ public record MethodRetrySpec(
 
 
 	MethodRetryPredicate combinedPredicate() {
-		ExceptionTypeFilter exceptionFilter = new ExceptionTypeFilter(this.includes, this.excludes, true);
+		ExceptionTypeFilter exceptionFilter = new ExceptionTypeFilter(this.includes, this.excludes);
 		return (method, throwable) -> exceptionFilter.match(throwable.getClass()) &&
 				this.predicate.shouldRetry(method, throwable);
 	}

spring-core/src/main/java/org/springframework/core/retry/DefaultRetryPolicy.java

@@ -51,7 +51,7 @@ class DefaultRetryPolicy implements RetryPolicy {
 
 		this.includes = includes;
 		this.excludes = excludes;
-		this.exceptionFilter = new ExceptionTypeFilter(this.includes, this.excludes, true);
+		this.exceptionFilter = new ExceptionTypeFilter(this.includes, this.excludes);
 		this.predicate = predicate;
 		this.backOff = backOff;
 	}

spring-core/src/main/java/org/springframework/util/ExceptionTypeFilter.java

@@ -18,21 +18,63 @@ package org.springframework.util;
 
 import java.util.Collection;
 
+import org.jspecify.annotations.Nullable;
+
 /**
- * An {@link InstanceFilter} implementation that handles exception types. A type
+ * An {@link InstanceFilter} that handles exception types.
- * will match against a given candidate if it is assignable to that candidate.
+ *
+ * <p>An exception type will match against a given candidate if it is assignable
+ * to that candidate.
  *
  * @author Stephane Nicoll
+ * @author Sam Brannen
  * @since 4.1
  */
 public class ExceptionTypeFilter extends InstanceFilter<Class<? extends Throwable>> {
 
-	public ExceptionTypeFilter(Collection<? extends Class<? extends Throwable>> includes,
+	/**
-			Collection<? extends Class<? extends Throwable>> excludes, boolean matchIfEmpty) {
+	 * Create a new {@code ExceptionTypeFilter} based on include and exclude
+	 * collections, with the {@code matchIfEmpty} flag set to {@code true}.
+	 * <p>See {@link #ExceptionTypeFilter(Collection, Collection, boolean)} for
+	 * details.
+	 * @param includes the collection of includes
+	 * @param excludes the collection of excludes
+	 * @since 7.0
+	 */
+	public ExceptionTypeFilter(@Nullable Collection<Class<? extends Throwable>> includes,
+			@Nullable Collection<Class<? extends Throwable>> excludes) {
+
+		super(includes, excludes);
+	}
+
+	/**
+	 * Create a new {@code ExceptionTypeFilter} based on include and exclude
+	 * collections.
+	 * <p>See {@link InstanceFilter#InstanceFilter(Collection, Collection, boolean)
+	 * InstanceFilter} for details.
+	 * @param includes the collection of includes
+	 * @param excludes the collection of excludes
+	 * @param matchIfEmpty the matching result if the includes and the excludes
+	 * collections are both {@code null} or empty
+	 */
+	public ExceptionTypeFilter(@Nullable Collection<? extends Class<? extends Throwable>> includes,
+			@Nullable Collection<? extends Class<? extends Throwable>> excludes, boolean matchIfEmpty) {
 
 		super(includes, excludes, matchIfEmpty);
 	}
 
+
+	/**
+	 * Determine if the specified {@code instance} matches the specified
+	 * {@code candidate}.
+	 * <p>By default, the two instances match if the {@code candidate} type is
+	 * {@linkplain Class#isAssignableFrom(Class) is assignable from} the
+	 * {@code instance} type.
+	 * <p>Can be overridden by subclasses.
+	 * @param instance the instance to check
+	 * @param candidate a candidate defined by this filter
+	 * @return {@code true} if the instance matches the candidate
+	 */
 	@Override
 	protected boolean match(Class<? extends Throwable> instance, Class<? extends Throwable> candidate) {
 		return candidate.isAssignableFrom(instance);

spring-core/src/main/java/org/springframework/util/InstanceFilter.java

@@ -22,13 +22,14 @@ import java.util.Collections;
 import org.jspecify.annotations.Nullable;
 
 /**
- * A simple instance filter that checks if a given instance match based on
+ * A simple instance filter that checks if a given instance matches based on
- * a collection of includes and excludes element.
+ * collections of includes and excludes.
  *
- * <p>Subclasses may want to override {@link #match(Object, Object)} to provide
+ * <p>Subclasses may override {@link #match(Object, Object)} to provide a custom
- * a custom matching algorithm.
+ * matching algorithm.
  *
  * @author Stephane Nicoll
+ * @author Sam Brannen
  * @since 4.1
  * @param <T> the instance type
  */
@@ -42,17 +43,33 @@ public class InstanceFilter<T> {
 
 
 	/**
-	 * Create a new instance based on includes/excludes collections.
+	 * Create a new {@code InstanceFilter} based on include and exclude collections,
-	 * <p>A particular element will match if it "matches" the one of the element in the
+	 * with the {@code matchIfEmpty} flag set to {@code true}.
-	 * includes list and  does not match one of the element in the excludes list.
+	 * <p>See {@link #InstanceFilter(Collection, Collection, boolean)} for details.
-	 * <p>Subclasses may redefine what matching means. By default, an element match with
-	 * another if it is equals according to {@link Object#equals(Object)}
-	 * <p>If both collections are empty, {@code matchIfEmpty} defines if
-	 * an element matches or not.
 	 * @param includes the collection of includes
 	 * @param excludes the collection of excludes
-	 * @param matchIfEmpty the matching result if both the includes and the excludes
+	 * @since 7.0
-	 * collections are empty
+	 */
+	public InstanceFilter(@Nullable Collection<? extends T> includes,
+			@Nullable Collection<? extends T> excludes) {
+
+		this(includes, excludes, true);
+	}
+
+	/**
+	 * Create a new {@code InstanceFilter} based on include and exclude collections.
+	 * <p>A particular element will match if it <em>matches</em> one of the elements
+	 * in the {@code includes} list and does not match one of the elements in the
+	 * {@code excludes} list.
+	 * <p>Subclasses may redefine what matching means. By default, an element
+	 * {@linkplain #match(Object, Object) matches} another if the two elements are
+	 * {@linkplain Object#equals(Object) equal}.
+	 * <p>If both collections are empty, {@code matchIfEmpty} defines if an element
+	 * matches or not.
+	 * @param includes the collection of includes
+	 * @param excludes the collection of excludes
+	 * @param matchIfEmpty the matching result if the includes and the excludes
+	 * collections are both {@code null} or empty
 	 */
 	public InstanceFilter(@Nullable Collection<? extends T> includes,
 			@Nullable Collection<? extends T> excludes, boolean matchIfEmpty) {
@@ -87,9 +104,12 @@ public class InstanceFilter<T> {
 	}
 
 	/**
-	 * Determine if the specified {@code instance} is equal to the
+	 * Determine if the specified {@code instance} matches the specified
-	 * specified {@code candidate}.
+	 * {@code candidate}.
-	 * @param instance the instance to handle
+	 * <p>By default, the two instances match if they are
+	 * {@linkplain Object#equals(Object) equal}.
+	 * <p>Can be overridden by subclasses.
+	 * @param instance the instance to check
 	 * @param candidate a candidate defined by this filter
 	 * @return {@code true} if the instance matches the candidate
 	 */
@@ -99,10 +119,10 @@ public class InstanceFilter<T> {
 
 	/**
 	 * Determine if the specified {@code instance} matches one of the candidates.
-	 * <p>If the candidates collection is {@code null}, returns {@code false}.
 	 * @param instance the instance to check
-	 * @param candidates a list of candidates
+	 * @param candidates the collection of candidates
-	 * @return {@code true} if the instance match or the candidates collection is null
+	 * @return {@code true} if the instance matches; {@code false} if the
+	 * candidates collection is empty or there is no match
 	 */
 	protected boolean match(T instance, Collection<? extends T> candidates) {
 		for (T candidate : candidates) {

spring-core/src/test/java/org/springframework/util/ExceptionTypeFilterTests.java

@@ -29,7 +29,7 @@ class ExceptionTypeFilterTests {
 
 	@Test
 	void subClassMatch() {
-		ExceptionTypeFilter filter = new ExceptionTypeFilter(List.of(RuntimeException.class), null, true);
+		ExceptionTypeFilter filter = new ExceptionTypeFilter(List.of(RuntimeException.class), null);
 		assertThat(filter.match(RuntimeException.class)).isTrue();
 		assertThat(filter.match(IllegalStateException.class)).isTrue();
 	}

spring-core/src/test/java/org/springframework/util/InstanceFilterTests.java

@@ -20,7 +20,6 @@ import java.util.List;
 
 import org.junit.jupiter.api.Test;
 
-import static java.util.Arrays.asList;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
@@ -30,47 +29,44 @@ class InstanceFilterTests {
 
 	@Test
 	void emptyFilterApplyMatchIfEmpty() {
-		InstanceFilter<String> filter = new InstanceFilter<>(null, null, true);
+		InstanceFilter<String> filter = new InstanceFilter<>(null, null);
 		match(filter, "foo");
 		match(filter, "bar");
 	}
 
 	@Test
 	void includesFilter() {
-		InstanceFilter<String> filter = new InstanceFilter<>(
+		InstanceFilter<String> filter = new InstanceFilter<>(List.of("First", "Second"), null);
-				asList("First", "Second"), null, true);
 		match(filter, "Second");
 		doNotMatch(filter, "foo");
 	}
 
 	@Test
 	void excludesFilter() {
-		InstanceFilter<String> filter = new InstanceFilter<>(
+		InstanceFilter<String> filter = new InstanceFilter<>(null, List.of("First", "Second"));
-				null, asList("First", "Second"), true);
 		doNotMatch(filter, "Second");
 		match(filter, "foo");
 	}
 
 	@Test
 	void includesAndExcludesFilters() {
-		InstanceFilter<String> filter = new InstanceFilter<>(
+		InstanceFilter<String> filter = new InstanceFilter<>(List.of("foo", "Bar"), List.of("First", "Second"));
-				asList("foo", "Bar"), asList("First", "Second"), true);
 		doNotMatch(filter, "Second");
 		match(filter, "foo");
 	}
 
 	@Test
 	void includesAndExcludesFiltersConflict() {
-		InstanceFilter<String> filter = new InstanceFilter<>(
+		InstanceFilter<String> filter = new InstanceFilter<>(List.of("First"), List.of("First"));
-				List.of("First"), List.of("First"), true);
 		doNotMatch(filter, "First");
 	}
 
-	private <T> void match(InstanceFilter<T> filter, T candidate) {
+
+	private static <T> void match(InstanceFilter<T> filter, T candidate) {
 		assertThat(filter.match(candidate)).as("filter '" + filter + "' should match " + candidate).isTrue();
 	}
 
-	private <T> void doNotMatch(InstanceFilter<T> filter, T candidate) {
+	private static <T> void doNotMatch(InstanceFilter<T> filter, T candidate) {
 		assertThat(filter.match(candidate)).as("filter '" + filter + "' should not match " + candidate).isFalse();
 	}