Polishing (aligned with main)

Author: jhoeller

spring-aop/src/main/java/org/springframework/aop/config/AopConfigUtils.java

@@ -121,21 +121,21 @@ private static BeanDefinition registerOrEscalateApcAsRequired(
 		Assert.notNull(registry, "BeanDefinitionRegistry must not be null");
 
 		if (registry.containsBeanDefinition(AUTO_PROXY_CREATOR_BEAN_NAME)) {
-			BeanDefinition apcDefinition = registry.getBeanDefinition(AUTO_PROXY_CREATOR_BEAN_NAME);
-			if (!cls.getName().equals(apcDefinition.getBeanClassName())) {
-				int currentPriority = findPriorityForClass(apcDefinition.getBeanClassName());
+			BeanDefinition beanDefinition = registry.getBeanDefinition(AUTO_PROXY_CREATOR_BEAN_NAME);
+			if (!cls.getName().equals(beanDefinition.getBeanClassName())) {
+				int currentPriority = findPriorityForClass(beanDefinition.getBeanClassName());
 				int requiredPriority = findPriorityForClass(cls);
 				if (currentPriority < requiredPriority) {
-					apcDefinition.setBeanClassName(cls.getName());
+					beanDefinition.setBeanClassName(cls.getName());
 				}
 			}
 			return null;
 		}
 
 		RootBeanDefinition beanDefinition = new RootBeanDefinition(cls);
 		beanDefinition.setSource(source);
-		beanDefinition.getPropertyValues().add("order", Ordered.HIGHEST_PRECEDENCE);
 		beanDefinition.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
+		beanDefinition.getPropertyValues().add("order", Ordered.HIGHEST_PRECEDENCE);
 		registry.registerBeanDefinition(AUTO_PROXY_CREATOR_BEAN_NAME, beanDefinition);
 		return beanDefinition;
 	}

spring-aop/src/main/java/org/springframework/aop/framework/AbstractAdvisingBeanPostProcessor.java

@@ -117,6 +117,7 @@ else if (advised.getTargetSource() == AdvisedSupport.EMPTY_TARGET_SOURCE &&
 			}
 			proxyFactory.addAdvisor(this.advisor);
 			customizeProxyFactory(proxyFactory);
+			proxyFactory.setPreFiltered(true);
 
 			// Use original ClassLoader if bean class not locally loaded in overriding class loader
 			ClassLoader classLoader = getProxyClassLoader();

spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractBeanFactoryAwareAdvisingPostProcessor.java

@@ -24,9 +24,9 @@
 import org.springframework.lang.Nullable;
 
 /**
- * Extension of {@link AbstractAutoProxyCreator} which implements {@link BeanFactoryAware},
- * adds exposure of the original target class for each proxied bean
- * ({@link AutoProxyUtils#ORIGINAL_TARGET_CLASS_ATTRIBUTE}),
+ * Extension of {@link AbstractAdvisingBeanPostProcessor} which implements
+ * {@link BeanFactoryAware}, adds exposure of the original target class for each
+ * proxied bean ({@link AutoProxyUtils#ORIGINAL_TARGET_CLASS_ATTRIBUTE}),
  * and participates in an externally enforced target-class mode for any given bean
  * ({@link AutoProxyUtils#PRESERVE_TARGET_CLASS_ATTRIBUTE}).
  * This post-processor is therefore aligned with {@link AbstractAutoProxyCreator}.

spring-context/src/main/java/org/springframework/context/annotation/ReflectiveScan.java

@@ -51,9 +51,9 @@
  * ignored.
  *
  * @author Stephane Nicoll
+ * @since 6.2
  * @see Reflective @Reflective
  * @see RegisterReflection @RegisterReflection
- * @since 6.2
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)

spring-web/src/main/java/org/springframework/web/util/RfcUriParser.java

@@ -30,7 +30,6 @@
  *
  * @author Rossen Stoyanchev
  * @since 6.2
- *
  * @see <a href="https://www.rfc-editor.org/info/rfc3986">RFC 3986</a>
  */
 abstract class RfcUriParser {
@@ -78,10 +77,10 @@ private static void fail(InternalParser parser, String message) {
 	 * @param query the query, if present
 	 * @param fragment the fragment, if present
 	 */
-	record UriRecord(@Nullable String scheme, boolean isOpaque,
-						@Nullable String user, @Nullable String host, @Nullable String port,
-						@Nullable String path, @Nullable String query, @Nullable String fragment) {
-
+	record UriRecord(
+			@Nullable String scheme, boolean isOpaque,
+			@Nullable String user, @Nullable String host, @Nullable String port,
+			@Nullable String path, @Nullable String query, @Nullable String fragment) {
 	}
 
 
@@ -130,6 +129,7 @@ public void handleEnd(InternalParser parser) {
 			}
 		},
 
+
 		HOST_OR_PATH {
 
 			@Override
@@ -158,6 +158,7 @@ public void handleEnd(InternalParser parser) {
 			}
 		},
 
+
 		SCHEME_OR_PATH {
 
 			@Override
@@ -188,6 +189,7 @@ public void handleEnd(InternalParser parser) {
 			}
 		},
 
+
 		HOST {
 
 			@Override
@@ -229,6 +231,7 @@ public void handleEnd(InternalParser parser) {
 			}
 		},
 
+
 		IPV6 {
 
 			@Override
@@ -259,6 +262,7 @@ public void handleEnd(InternalParser parser) {
 			}
 		},
 
+
 		PORT {
 
 			@Override
@@ -291,6 +295,7 @@ public void handleEnd(InternalParser parser) {
 			}
 		},
 
+
 		PATH {
 
 			@Override
@@ -319,6 +324,7 @@ public void handleEnd(InternalParser parser) {
 			}
 		},
 
+
 		QUERY {
 
 			@Override
@@ -334,7 +340,9 @@ public void handleEnd(InternalParser parser) {
 			}
 		},
 
+
 		FRAGMENT {
+
 			@Override
 			public void handleNext(InternalParser parser, char c, int i) {
 			}
@@ -345,6 +353,7 @@ public void handleEnd(InternalParser parser) {
 			}
 		},
 
+
 		WILDCARD {
 
 			@Override
@@ -358,6 +367,7 @@ public void handleEnd(InternalParser parser) {
 			}
 		};
 
+
 		/**
 		 * Method to handle each character from the input string.
 		 * @param parser provides access to parsing state, and helper methods
@@ -429,6 +439,7 @@ public InternalParser(String uri) {
 			this.uri = uri;
 		}
 
+
 		// Check internal state
 
 		public boolean hasScheme() {
@@ -451,6 +462,7 @@ public boolean isAtStartOfComponent() {
 			return (this.index == this.componentIndex);
 		}
 
+
 		// Top-level parse loop, iterate over chars and delegate to states
 
 		public UriRecord parse() {
@@ -475,6 +487,7 @@ public char charAtIndex() {
 			return this.uri.charAt(this.index);
 		}
 
+
 		// Transitions and index updates
 
 		public void advanceTo(State state) {
@@ -500,6 +513,7 @@ public void index(int index) {
 			this.index = index;
 		}
 
+
 		// Component capture
 
 		public InternalParser resolveIfOpaque() {
@@ -593,6 +607,7 @@ public InternalParser markPercentEncoding() {
 			return this;
 		}
 
+
 		// Encoding and curly bracket handling
 
 		/**
@@ -643,6 +658,7 @@ else if (c == '}') {
 			return (this.openCurlyBracketCount > 0);
 		}
 
+
 		@Override
 		public String toString() {
 			return "[State=" + this.state + ", index=" + this.index + ", componentIndex=" + this.componentIndex +