Filter throwable by ExceptionTypeFilter.

Signed-off-by: Mengqi Xu <[email protected]>

Author: remeio

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

@@ -25,12 +25,14 @@
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.util.Assert;
+import org.springframework.util.ExceptionTypeFilter;
 
 /**
  * Default {@link RetryPolicy} created by {@link RetryPolicy.Builder}.
  *
  * @author Sam Brannen
  * @author Mahmoud Ben Hassine
+ * @author Mengqi Xu
  * @since 7.0
  */
 class DefaultRetryPolicy implements RetryPolicy {
@@ -105,6 +107,8 @@ private class DefaultRetryPolicyExecution implements RetryExecution {
 
 		private int retryCount;
 
+		private final ExceptionTypeFilter exceptionTypeFilter = new ExceptionTypeFilter(DefaultRetryPolicy.this.includes,
+				DefaultRetryPolicy.this.excludes, true);
 
 		@Override
 		public boolean shouldRetry(Throwable throwable) {
@@ -118,26 +122,8 @@ public boolean shouldRetry(Throwable throwable) {
 					return false;
 				}
 			}
-			if (!DefaultRetryPolicy.this.excludes.isEmpty()) {
-				for (Class<? extends Throwable> excludedType : DefaultRetryPolicy.this.excludes) {
-					if (excludedType.isInstance(throwable)) {
-						return false;
-					}
-				}
-			}
-			if (!DefaultRetryPolicy.this.includes.isEmpty()) {
-				boolean included = false;
-				for (Class<? extends Throwable> includedType : DefaultRetryPolicy.this.includes) {
-					if (includedType.isInstance(throwable)) {
-						included = true;
-						break;
-					}
-				}
-				if (!included) {
-					return false;
-				}
-			}
-			return DefaultRetryPolicy.this.predicate == null || DefaultRetryPolicy.this.predicate.test(throwable);
+			return this.exceptionTypeFilter.match(throwable.getClass()) &&
+					(DefaultRetryPolicy.this.predicate == null || DefaultRetryPolicy.this.predicate.test(throwable));
 		}
 
 		@Override