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

Merge branch '6.2.x'

This commit is contained in:
Sam Brannen 2025-03-29 12:57:49 +01:00
parent 8379ac772a 9fd1d0c6a3
commit 9956cc11bb
10 changed files with 55 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactory.java
View File

@ -110,7 +110,7 @@ public class ReflectiveAspectJAdvisorFactory extends AbstractAspectJAdvisorFacto
* Create a new {@code ReflectiveAspectJAdvisorFactory}, propagating the given
* {@link BeanFactory} to the created {@link AspectJExpressionPointcut} instances,
* for bean pointcut handling as well as consistent {@link ClassLoader} resolution.
* @param beanFactory the BeanFactory to propagate (may be {@code null}}
* @param beanFactory the BeanFactory to propagate (may be {@code null})
* @since 4.3.6
* @see AspectJExpressionPointcut#setBeanFactory
* @see org.springframework.beans.factory.config.ConfigurableBeanFactory#getBeanClassLoader()

8
spring-core/src/main/java/org/springframework/util/ObjectUtils.java
View File

@ -410,10 +410,10 @@ public abstract class ObjectUtils {
}
/**
* Return a hash code for the given object; typically the value of
* {@code Object#hashCode()}}. If the object is an array,
* this method will delegate to any of the {@code Arrays.hashCode}
* methods. If the object is {@code null}, this method returns 0.
* Return a hash code for the given object, typically the value of
* {@link Object#hashCode()}. If the object is an array, this method
* will delegate to one of the {@code Arrays.hashCode} methods. If
* the object is {@code null}, this method returns {@code 0}.
* @see Object#hashCode()
* @see Arrays
*/

4
spring-jms/src/main/java/org/springframework/jms/connection/UserCredentialsConnectionFactoryAdapter.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2024 the original author or authors.
* Copyright 2002-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -36,7 +36,7 @@ import org.springframework.util.StringUtils;
* given user credentials to every standard methods that can also be used with
* authentication, this {@code createConnection()} and {@code createContext()}. In
* other words, it is implicitly invoking {@code createConnection(username, password)} or
* {@code createContext(username, password)}} on the target. All other methods simply
* {@code createContext(username, password)} on the target. All other methods simply
* delegate to the corresponding methods of the target ConnectionFactory.
*
* <p>Can be used to proxy a target JNDI ConnectionFactory that does not have user

4
spring-jms/src/main/java/org/springframework/jms/support/converter/MessagingMessageConverter.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 the original author or authors.
* Copyright 2002-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -132,7 +132,7 @@ public class MessagingMessageConverter implements MessageConverter, Initializing
/**
* Create a JMS message for the specified payload and conversionHint.
* The conversion hint is an extra object passed to the {@link MessageConverter},
* for example, the associated {@code MethodParameter} (may be {@code null}}.
* for example, the associated {@code MethodParameter} (may be {@code null}).
* @since 4.3
* @see MessageConverter#toMessage(Object, Session)
*/

4
spring-jms/src/main/java/org/springframework/jms/support/converter/SmartMessageConverter.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2016 the original author or authors.
* Copyright 2002-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -40,7 +40,7 @@ public interface SmartMessageConverter extends MessageConverter {
* @param object the object to convert
* @param session the Session to use for creating a JMS Message
* @param conversionHint an extra object passed to the {@link MessageConverter},
* for example, the associated {@code MethodParameter} (may be {@code null}}
* for example, the associated {@code MethodParameter} (may be {@code null})
* @return the JMS Message
* @throws jakarta.jms.JMSException if thrown by JMS API methods
* @throws MessageConversionException in case of conversion failure

6
spring-messaging/src/main/java/org/springframework/messaging/converter/AbstractMessageConverter.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 the original author or authors.
* Copyright 2002-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -275,7 +275,7 @@ public abstract class AbstractMessageConverter implements SmartMessageConverter
* @param message the input message
* @param targetClass the target class for the conversion
* @param conversionHint an extra object passed to the {@link MessageConverter},
* for example, the associated {@code MethodParameter} (may be {@code null}}
* for example, the associated {@code MethodParameter} (may be {@code null})
* @return the result of the conversion, or {@code null} if the converter cannot
* perform the conversion
* @since 4.2
@ -291,7 +291,7 @@ public abstract class AbstractMessageConverter implements SmartMessageConverter
* @param payload the Object to convert
* @param headers optional headers for the message (may be {@code null})
* @param conversionHint an extra object passed to the {@link MessageConverter},
* for example, the associated {@code MethodParameter} (may be {@code null}}
* for example, the associated {@code MethodParameter} (may be {@code null})
* @return the resulting payload for the message, or {@code null} if the converter
* cannot perform the conversion
* @since 4.2

6
spring-messaging/src/main/java/org/springframework/messaging/converter/SmartMessageConverter.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2017 the original author or authors.
* Copyright 2002-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -40,7 +40,7 @@ public interface SmartMessageConverter extends MessageConverter {
* @param message the input message
* @param targetClass the target class for the conversion
* @param conversionHint an extra object passed to the {@link MessageConverter},
* for example, the associated {@code MethodParameter} (may be {@code null}}
* for example, the associated {@code MethodParameter} (may be {@code null})
* @return the result of the conversion, or {@code null} if the converter cannot
* perform the conversion
* @see #fromMessage(Message, Class)
@ -54,7 +54,7 @@ public interface SmartMessageConverter extends MessageConverter {
* @param payload the Object to convert
* @param headers optional headers for the message (may be {@code null})
* @param conversionHint an extra object passed to the {@link MessageConverter},
* for example, the associated {@code MethodParameter} (may be {@code null}}
* for example, the associated {@code MethodParameter} (may be {@code null})
* @return the new message, or {@code null} if the converter does not support the
* Object type or the target media type
* @see #toMessage(Object, MessageHeaders)

29
spring-web/src/main/java/org/springframework/http/server/observation/ServerHttpObservationDocumentation.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -23,9 +23,11 @@ import io.micrometer.observation.ObservationConvention;
import io.micrometer.observation.docs.ObservationDocumentation;
/**
* Documented {@link io.micrometer.common.KeyValue KeyValues} for the HTTP server observations
* for Servlet-based web applications.
* <p>This class is used by automated tools to document KeyValues attached to the HTTP server observations.
* Documented {@link io.micrometer.common.KeyValue KeyValues} for the HTTP server
* observations for Servlet-based web applications.
*
* <p>This class is used by automated tools to document KeyValues attached to the
* HTTP server observations.
*
* @author Brian Clozel
* @since 6.0
@ -56,7 +58,8 @@ public enum ServerHttpObservationDocumentation implements ObservationDocumentati
public enum LowCardinalityKeyNames implements KeyName {
/**
* Name of HTTP request method or {@value KeyValue#NONE_VALUE} if the request was not received properly.
* Name of the HTTP request method or {@value KeyValue#NONE_VALUE} if the
* request was not received properly.
*/
METHOD {
@Override
@ -67,7 +70,8 @@ public enum ServerHttpObservationDocumentation implements ObservationDocumentati
},
/**
* HTTP response raw status code, or {@code "UNKNOWN"} if no response was created.
* HTTP response raw status code, or {@code "UNKNOWN"} if no response was
* created.
*/
STATUS {
@Override
@ -77,9 +81,10 @@ public enum ServerHttpObservationDocumentation implements ObservationDocumentati
},
/**
* URI pattern for the matching handler if available, falling back to {@code REDIRECTION} for 3xx responses,
* {@code NOT_FOUND} for 404 responses, {@code root} for requests with no path info,
* and {@code UNKNOWN} for all other requests.
* URI pattern for the matching handler if available, falling back to
* {@code REDIRECTION} for 3xx responses, {@code NOT_FOUND} for 404
* responses, {@code root} for requests with no path info, and
* {@code UNKNOWN} for all other requests.
*/
URI {
@Override
@ -89,7 +94,8 @@ public enum ServerHttpObservationDocumentation implements ObservationDocumentati
},
/**
* Name of the exception thrown during the exchange, or {@value KeyValue#NONE_VALUE}} if no exception happened.
* Name of the exception thrown during the exchange, or
* {@value KeyValue#NONE_VALUE} if no exception was thrown.
*/
EXCEPTION {
@Override
@ -113,7 +119,7 @@ public enum ServerHttpObservationDocumentation implements ObservationDocumentati
public enum HighCardinalityKeyNames implements KeyName {
/**
* HTTP request URI.
* HTTP request URL.
*/
HTTP_URL {
@Override
@ -123,4 +129,5 @@ public enum ServerHttpObservationDocumentation implements ObservationDocumentati
}
}
}

29
spring-web/src/main/java/org/springframework/http/server/reactive/observation/ServerHttpObservationDocumentation.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -23,9 +23,11 @@ import io.micrometer.observation.ObservationConvention;
import io.micrometer.observation.docs.ObservationDocumentation;
/**
* Documented {@link io.micrometer.common.KeyValue KeyValues} for the HTTP server observations
* for reactive web applications.
* <p>This class is used by automated tools to document KeyValues attached to the HTTP server observations.
* Documented {@link io.micrometer.common.KeyValue KeyValues} for the HTTP server
* observations for reactive web applications.
*
* <p>This class is used by automated tools to document KeyValues attached to the
* HTTP server observations.
*
* @author Brian Clozel
* @since 6.0
@ -56,7 +58,8 @@ public enum ServerHttpObservationDocumentation implements ObservationDocumentati
public enum LowCardinalityKeyNames implements KeyName {
/**
* Name of HTTP request method or {@value KeyValue#NONE_VALUE} if the request was not received properly.
* Name of the HTTP request method or {@value KeyValue#NONE_VALUE} if the
* request was not received properly.
*/
METHOD {
@Override
@ -67,7 +70,8 @@ public enum ServerHttpObservationDocumentation implements ObservationDocumentati
},
/**
* HTTP response raw status code, or {@code "UNKNOWN"} if no response was created.
* HTTP response raw status code, or {@code "UNKNOWN"} if no response was
* created.
*/
STATUS {
@Override
@ -77,9 +81,10 @@ public enum ServerHttpObservationDocumentation implements ObservationDocumentati
},
/**
* URI pattern for the matching handler if available, falling back to {@code REDIRECTION} for 3xx responses,
* {@code NOT_FOUND} for 404 responses, {@code root} for requests with no path info,
* and {@code UNKNOWN} for all other requests.
* URI pattern for the matching handler if available, falling back to
* {@code REDIRECTION} for 3xx responses, {@code NOT_FOUND} for 404
* responses, {@code root} for requests with no path info, and
* {@code UNKNOWN} for all other requests.
*/
URI {
@Override
@ -89,7 +94,8 @@ public enum ServerHttpObservationDocumentation implements ObservationDocumentati
},
/**
* Name of the exception thrown during the exchange, or {@value KeyValue#NONE_VALUE} if no exception happened.
* Name of the exception thrown during the exchange, or
* {@value KeyValue#NONE_VALUE} if no exception was thrown.
*/
EXCEPTION {
@Override
@ -113,7 +119,7 @@ public enum ServerHttpObservationDocumentation implements ObservationDocumentati
public enum HighCardinalityKeyNames implements KeyName {
/**
* HTTP request URI.
* HTTP request URL.
*/
HTTP_URL {
@Override
@ -123,4 +129,5 @@ public enum ServerHttpObservationDocumentation implements ObservationDocumentati
}
}
}

4
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilder.java
View File

@ -139,7 +139,7 @@ public class MvcUriComponentsBuilder {
/**
* Create an instance of this class with a base URL. After that calls to one
* of the instance based {@code withXxx(...}} methods will create URLs relative
* of the instance based {@code withXxx(...)} methods will create URLs relative
* to the given base URL.
*/
public static MvcUriComponentsBuilder relativeTo(UriComponentsBuilder baseUrl) {
@ -490,7 +490,7 @@ public class MvcUriComponentsBuilder {
}
/**
* An alternative to {@link #fromMethodName(Class, String, Object...)}} for
* An alternative to {@link #fromMethodName(Class, String, Object...)} for
* use with an instance of this class created via {@link #relativeTo}.
* <p><strong>Note:</strong> This method extracts values from "Forwarded"
* and "X-Forwarded-*" headers if found. See class-level docs.