GH-2478 Handle conversion exception in AsyncRabbitTemplate

[BenEfrati]

Previously, conversion errors in AsyncRabbitTemplate lead to AmqpReplyTimeoutException

Fixes #2478

#2478 (comment)

[pivotal-cla]

@BenEfrati Please sign the Contributor License Agreement!

Click here to manually synchronize the status of this Pull Request.

See the FAQ for frequently asked questions.

[pivotal-cla]

@BenEfrati Thank you for signing the Contributor License Agreement!

[artembilan]

Please, run ./gradlew check locally before pushing changes to PR.
Right now it even does not compile:

 /home/runner/work/spring-amqp/spring-amqp/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/AsyncRabbitTemplate.java:614: error: cannot find symbol
						} catch (MessageConversionException e) {
						         ^
  symbol:   class MessageConversionException
  location: class AsyncRabbitTemplate

[BenEfrati]

Hi,
Sorry, at first I fork and created branch from old code, missed the import after sync with upstream.
BenEfrati@50452f8
Pushed the fixed code

[artembilan]

LGTM.
Please, add your name to the @author list of all the affected classes.

[artembilan]

May we also verify what exactly exception we got here?

[BenEfrati]

Suggested change

	final CountDownLatch cdl = new CountDownLatch(1);
	final AtomicReference<Object> resultRef = new AtomicReference<>();
	replyFuture.whenComplete((result, ex) -> {
	resultRef.set(result);
	cdl.countDown();
	});
	assertThat(cdl.await(10, TimeUnit.SECONDS)).isTrue();
	assertThat(replyFuture).isCompletedExceptionally();
	assertThat(replyFuture).failsWithin(Duration.ofSeconds(10))
	.withThrowableThat()
	.withCauseInstanceOf(MessageConversionException.class);

Something like this?

[artembilan]

Sounds good!
But does not look like it would be a good candidate to commit such a suggestion: too many broken indents.

[artembilan]

Or never mind. I like it.
You have changed the logic, but at the same it is covered with that failsWithin() 😄
Committing and merging.
Thank you!

[artembilan]

But this line has to be removed then 😄

[BenEfrati]

sure :)

Do you want me to align other tests to use failsWithin

void testReturn() {
...
		assertThat(future)
				.as("Expected exception")
				.failsWithin(Duration.ofSeconds(10))
				.withThrowableThat()
				.withCauseInstanceOf(AmqpMessageReturnedException.class)
				.extracting("routingKey")
				.isEqualTo(this.requests.getName() + "x");

instead

try {
			future.get(10, TimeUnit.SECONDS);
			fail("Expected exception");
		}
		catch (ExecutionException e) {
			assertThat(e.getCause()).isInstanceOf(AmqpMessageReturnedException.class);
			assertThat(((AmqpMessageReturnedException) e.getCause()).getRoutingKey()).isEqualTo(this.requests.getName() + "x");
		}

[artembilan]

I would appreciate.
Thanks.
Those try..catch in tests is on my TODO list in favor of assertThat() when I touch these classes.
Although still would be with some code.
But now I have learned about failsWithin() which looks much cleaner. 😄

[artembilan]

@BenEfrati ,

thank you for contribution; looking forward for more!