Skip to content

Commit 73cd8ea

Browse files
garyrussellartembilan
authored andcommitted
Remove erroneous @nullable
Incorrectly added to message converter.
1 parent dda3ada commit 73cd8ea

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

spring-amqp/src/main/java/org/springframework/amqp/support/converter/MessageConverter.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ default Message toMessage(Object object, MessageProperties messageProperties, @N
6262
* @return the converted Java object
6363
* @throws MessageConversionException in case of conversion failure
6464
*/
65-
@Nullable
6665
Object fromMessage(Message message) throws MessageConversionException;
6766

6867
}

spring-amqp/src/main/java/org/springframework/amqp/support/converter/MessagingMessageConverter.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.springframework.amqp.support.AmqpHeaderMapper;
2323
import org.springframework.amqp.support.SimpleAmqpHeaderMapper;
2424
import org.springframework.beans.factory.InitializingBean;
25-
import org.springframework.lang.Nullable;
2625
import org.springframework.messaging.Message;
2726
import org.springframework.messaging.support.MessageBuilder;
2827
import org.springframework.util.Assert;
@@ -131,7 +130,6 @@ public Object fromMessage(org.springframework.amqp.core.Message message) throws
131130
* @param message the AMQP Message to extract {@code payload}.
132131
* @return the extracted {@code payload}.
133132
*/
134-
@Nullable
135133
protected Object extractPayload(org.springframework.amqp.core.Message message) {
136134
return this.payloadConverter.fromMessage(message);
137135
}

spring-amqp/src/main/java/org/springframework/amqp/support/converter/RemoteInvocationAwareMessageConverterAdapter.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.springframework.amqp.core.Message;
2121
import org.springframework.amqp.core.MessageProperties;
2222
import org.springframework.beans.factory.BeanClassLoaderAware;
23-
import org.springframework.lang.Nullable;
2423
import org.springframework.remoting.support.RemoteInvocationResult;
2524
import org.springframework.util.Assert;
2625

@@ -63,12 +62,14 @@ public Message toMessage(Object object, MessageProperties messageProperties) thr
6362
}
6463

6564
@Override
66-
@Nullable
6765
public Object fromMessage(Message message) throws MessageConversionException {
6866
Object result = this.delegate.fromMessage(message);
6967
if (result instanceof RemoteInvocationResult) {
7068
try {
7169
result = ((RemoteInvocationResult) result).recreate();
70+
if (result == null) {
71+
throw new MessageConversionException("RemoteInvocationResult returned null");
72+
}
7273
}
7374
catch (Throwable e) { // NOSONAR
7475
throw new AmqpRemoteException(e);

0 commit comments

Comments
 (0)