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

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)