root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch '6.2.x' 

# Conflicts:
#	spring-aop/src/main/java/org/springframework/aop/framework/AbstractAdvisingBeanPostProcessor.java
This commit is contained in:
Juergen Hoeller 2025-08-06 19:03:14 +02:00
parent d5408c047d 5df9fd4eff
commit 573c5d96b9
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,9 +51,9 @@ import org.springframework.core.annotation.AliasFor;
* ignored. * ignored.
* *
* @author Stephane Nicoll * @author Stephane Nicoll
* @since 6.2
* @see Reflective @Reflective * @see Reflective @Reflective
* @see RegisterReflection @RegisterReflection * @see RegisterReflection @RegisterReflection
* @since 6.2
*/ */
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE) @Target(ElementType.TYPE)

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

@ -30,7 +30,6 @@ import org.springframework.util.Assert;
* *
* @author Rossen Stoyanchev * @author Rossen Stoyanchev
* @since 6.2 * @since 6.2
*
* @see <a href="https://www.rfc-editor.org/info/rfc3986">RFC 3986</a> * @see <a href="https://www.rfc-editor.org/info/rfc3986">RFC 3986</a>
*/ */
abstract class RfcUriParser { abstract class RfcUriParser {
@ -78,10 +77,10 @@ abstract class RfcUriParser {
* @param query the query, if present * @param query the query, if present
* @param fragment the fragment, if present * @param fragment the fragment, if present
*/ */
record UriRecord(@Nullable String scheme, boolean isOpaque, record UriRecord(
@Nullable String user, @Nullable String host, @Nullable String port, @Nullable String scheme, boolean isOpaque,
@Nullable String path, @Nullable String query, @Nullable String fragment) { @Nullable String user, @Nullable String host, @Nullable String port,
@Nullable String path, @Nullable String query, @Nullable String fragment) {
} }
@ -130,6 +129,7 @@ abstract class RfcUriParser {
} }
}, },
HOST_OR_PATH { HOST_OR_PATH {
@Override @Override
@ -158,6 +158,7 @@ abstract class RfcUriParser {
} }
}, },
SCHEME_OR_PATH { SCHEME_OR_PATH {
@Override @Override
@ -188,6 +189,7 @@ abstract class RfcUriParser {
} }
}, },
HOST { HOST {
@Override @Override
@ -229,6 +231,7 @@ abstract class RfcUriParser {
} }
}, },
IPV6 { IPV6 {
@Override @Override
@ -259,6 +262,7 @@ abstract class RfcUriParser {
} }
}, },
PORT { PORT {
@Override @Override
@ -291,6 +295,7 @@ abstract class RfcUriParser {
} }
}, },
PATH { PATH {
@Override @Override
@ -319,6 +324,7 @@ abstract class RfcUriParser {
} }
}, },
QUERY { QUERY {
@Override @Override
@ -334,7 +340,9 @@ abstract class RfcUriParser {
} }
}, },
FRAGMENT { FRAGMENT {
@Override @Override
public void handleNext(InternalParser parser, char c, int i) { public void handleNext(InternalParser parser, char c, int i) {
} }
@ -345,6 +353,7 @@ abstract class RfcUriParser {
} }
}, },
WILDCARD { WILDCARD {
@Override @Override
@ -358,6 +367,7 @@ abstract class RfcUriParser {
} }
}; };
/** /**
* Method to handle each character from the input string. * Method to handle each character from the input string.
* @param parser provides access to parsing state, and helper methods * @param parser provides access to parsing state, and helper methods
@ -422,6 +432,7 @@ abstract class RfcUriParser {
this.uri = uri; this.uri = uri;
} }
// Check internal state // Check internal state
public boolean hasScheme() { public boolean hasScheme() {
@ -444,6 +455,7 @@ abstract class RfcUriParser {
return (this.index == this.componentIndex); return (this.index == this.componentIndex);
} }
// Top-level parse loop, iterate over chars and delegate to states // Top-level parse loop, iterate over chars and delegate to states
public UriRecord parse() { public UriRecord parse() {
@ -468,6 +480,7 @@ abstract class RfcUriParser {
return this.uri.charAt(this.index); return this.uri.charAt(this.index);
} }
// Transitions and index updates // Transitions and index updates
public void advanceTo(State state) { public void advanceTo(State state) {
@ -493,6 +506,7 @@ abstract class RfcUriParser {
this.index = index; this.index = index;
} }
// Component capture // Component capture
public InternalParser resolveIfOpaque() { public InternalParser resolveIfOpaque() {
@ -586,6 +600,7 @@ abstract class RfcUriParser {
return this; return this;
} }
// Encoding and curly bracket handling // Encoding and curly bracket handling
/** /**
@ -636,6 +651,7 @@ abstract class RfcUriParser {
return (this.openCurlyBracketCount > 0); return (this.openCurlyBracketCount > 0);
} }
@Override @Override
public String toString() { public String toString() {
return "[State=" + this.state + ", index=" + this.index + ", componentIndex=" + this.componentIndex + return "[State=" + this.state + ", index=" + this.index + ", componentIndex=" + this.componentIndex +