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

AMQP-452: PRC: RemoteInvocResult for exceptions

Browse Source 
JIRA: https://jira.spring.io/browse/AMQP-452

When the `body` of the received `message` in the `AmqpInvokerServiceExporter` isn't an instance of `RemoteInvocation`,
we should wrap an appropriate `IllegalArgumentException` to the `RemoteInvocationResult`.
It allows for for `AmqpClientInterceptor` to unwrap the reply correctly and rethrow to the caller.

Conflicts:
	spring-amqp/src/main/java/org/springframework/amqp/remoting/service/AmqpInvokerServiceExporter.java

Resolved.
This commit is contained in:
Artem Bilan
2014-12-11 18:51:18 +02:00
committed by Gary Russell
parent d54ff9a659
commit 489a6b20d2
2 changed files with 56 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-amqp/src/main/java/org/springframework/amqp/remoting/service/AmqpInvokerServiceExporter.java
View File

@@ -48,6 +48,7 @@ import org.springframework.remoting.support.RemoteInvocationResult;
* "http://static.springsource.org/spring-amqp/reference/html/amqp.html#request-reply" >here</a>.
*
* @author David Bilge
* @author Artem Bilan
* @since 1.2
*/
public class AmqpInvokerServiceExporter extends RemoteInvocationBasedExporter implements MessageListener {
@@ -64,13 +65,16 @@ public class AmqpInvokerServiceExporter extends RemoteInvocationBasedExporter im
}
Object invocationRaw = messageConverter.fromMessage(message);
if (invocationRaw == null || !(invocationRaw instanceof RemoteInvocation)) {
send(new RuntimeException("The message does not contain a RemoteInvocation payload"), replyToAddress);
return;
}
RemoteInvocation invocation = (RemoteInvocation) invocationRaw;
RemoteInvocationResult remoteInvocationResult = invokeAndCreateResult(invocation, getService());
RemoteInvocationResult remoteInvocationResult;
if (invocationRaw == null || !(invocationRaw instanceof RemoteInvocation)) {
remoteInvocationResult = new RemoteInvocationResult(
new IllegalArgumentException("The message does not contain a RemoteInvocation payload"));
}
else {
RemoteInvocation invocation = (RemoteInvocation) invocationRaw;
remoteInvocationResult = invokeAndCreateResult(invocation, getService());
}
send(remoteInvocationResult, replyToAddress);
}

50
spring-amqp/src/test/java/org/springframework/amqp/remoting/RemotingTest.java
View File

@@ -13,6 +13,12 @@
package org.springframework.amqp.remoting;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.instanceOf;
import static org.junit.Assert.assertThat;
import java.util.concurrent.atomic.AtomicBoolean;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -29,16 +35,21 @@ import org.springframework.amqp.remoting.testservice.GeneralException;
import org.springframework.amqp.remoting.testservice.SpecialException;
import org.springframework.amqp.remoting.testservice.TestServiceImpl;
import org.springframework.amqp.remoting.testservice.TestServiceInterface;
import org.springframework.amqp.support.converter.MessageConversionException;
import org.springframework.amqp.support.converter.MessageConverter;
import org.springframework.amqp.support.converter.SimpleMessageConverter;
/**
* @author David Bilge
* @author Artem Bilan
* @since 1.2
*/
public class RemotingTest {
private TestServiceInterface riggedProxy;
private AmqpInvokerServiceExporter serviceExporter;
/**
* Set up a rig of directly wired-up proxy and service listener so that both can be tested together without needing
* a running rabbit.
@@ -47,11 +58,11 @@ public class RemotingTest {
public void initializeTestRig() throws Exception {
// Set up the service
TestServiceInterface testService = new TestServiceImpl();
final AmqpInvokerServiceExporter serviceExporter = new AmqpInvokerServiceExporter();
this.serviceExporter = new AmqpInvokerServiceExporter();
final SentSavingTemplate sentSavingTemplate = new SentSavingTemplate();
serviceExporter.setAmqpTemplate(sentSavingTemplate);
serviceExporter.setService(testService);
serviceExporter.setServiceInterface(TestServiceInterface.class);
this.serviceExporter.setAmqpTemplate(sentSavingTemplate);
this.serviceExporter.setService(testService);
this.serviceExporter.setServiceInterface(TestServiceInterface.class);
// Set up the client
AmqpProxyFactoryBean amqpProxyFactoryBean = new AmqpProxyFactoryBean();
@@ -100,4 +111,35 @@ public class RemotingTest {
Assert.assertNotNull(returnedException);
Assert.assertTrue(returnedException instanceof SpecialException);
}
@Test
public void testWrongRemoteInvocationArgument() {
MessageConverter messageConverter = this.serviceExporter.getMessageConverter();
this.serviceExporter.setMessageConverter(new SimpleMessageConverter() {
private AtomicBoolean invoked = new AtomicBoolean();
@Override
protected Message createMessage(Object object, MessageProperties messageProperties)
throws MessageConversionException {
Message message = super.createMessage(object, messageProperties);
if (!invoked.getAndSet(true)) {
messageProperties.setContentType(null);
}
return message;
}
});
try {
riggedProxy.simpleStringReturningTestMethod("Test");
}
catch (Exception e) {
assertThat(e, instanceOf(IllegalArgumentException.class));
assertThat(e.getMessage(), containsString("The message does not contain a RemoteInvocation payload"));
}
this.serviceExporter.setMessageConverter(messageConverter);
}
}