Apply "instanceof pattern matching" (#29710)

diguage · web-flow · commit 511dab1ade9c · 2022-12-18T12:46:15.000+01:00
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAdvisorChainFactory.java b/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAdvisorChainFactory.java
@@ -65,11 +65,11 @@ public List<Object> getInterceptorsAndDynamicInterceptionAdvice(
 				if (config.isPreFiltered() || pointcutAdvisor.getPointcut().getClassFilter().matches(actualClass)) {
 					MethodMatcher mm = pointcutAdvisor.getPointcut().getMethodMatcher();
 					boolean match;
-					if (mm instanceof IntroductionAwareMethodMatcher) {
+					if (mm instanceof IntroductionAwareMethodMatcher iamm) {
 						if (hasIntroductions == null) {
 							hasIntroductions = hasMatchingIntroductions(advisors, actualClass);
 						}
-						match = ((IntroductionAwareMethodMatcher) mm).matches(method, actualClass, hasIntroductions);
+						match = iamm.matches(method, actualClass, hasIntroductions);
 					}
 					else {
 						match = mm.matches(method, actualClass);

Original file line number	Diff line number	Diff line change
`@@ -65,11 +65,11 @@ public List<Object> getInterceptorsAndDynamicInterceptionAdvice(`
`65`	`65`	`if (config.isPreFiltered() \|\| pointcutAdvisor.getPointcut().getClassFilter().matches(actualClass)) {`
`66`	`66`	`MethodMatcher mm = pointcutAdvisor.getPointcut().getMethodMatcher();`
`67`	`67`	`boolean match;`
`68`		`- if (mm instanceof IntroductionAwareMethodMatcher) {`
	`68`	`+ if (mm instanceof IntroductionAwareMethodMatcher iamm) {`
`69`	`69`	`if (hasIntroductions == null) {`
`70`	`70`	`hasIntroductions = hasMatchingIntroductions(advisors, actualClass);`
`71`	`71`	`}`
`72`		`- match = ((IntroductionAwareMethodMatcher) mm).matches(method, actualClass, hasIntroductions);`
	`72`	`+ match = iamm.matches(method, actualClass, hasIntroductions);`
`73`	`73`	`}`
`74`	`74`	`else {`
`75`	`75`	`match = mm.matches(method, actualClass);`