Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.2.x'

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

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