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

AMQP-466: Reinstate and Deprecate Constant

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

Avoid (unlikely, but possible) breaking change.

Deprecate `AddressUtils` altogether.
Revert the impacted code to use only `message.getMessageProperties().getReplyToAddress()`, where the decoding operation is located now.
This commit is contained in:
Gary Russell
2015-01-12 10:06:41 -05:00
committed by Artem Bilan
parent 0055277ba7
commit 53d15cbaad
5 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-amqp/src/main/java/org/springframework/amqp/core/AddressUtils.java
View File

@@ -20,8 +20,15 @@ package org.springframework.amqp.core;
* @since 1.4.1
*
*/
@Deprecated
public class AddressUtils {
/**
* @deprecated Use the constant in {@link Address#AMQ_RABBITMQ_REPLY_TO}.
*/
@Deprecated
public static final String AMQ_RABBITMQ_REPLY_TO = Address.AMQ_RABBITMQ_REPLY_TO;
/**
* Decodes the reply-to {@link Address} into exchange/key.
*

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

@@ -15,7 +15,6 @@ package org.springframework.amqp.remoting.service;
import org.springframework.amqp.AmqpRejectAndDontRequeueException;
import org.springframework.amqp.core.Address;
import org.springframework.amqp.core.AddressUtils;
import org.springframework.amqp.core.AmqpTemplate;
import org.springframework.amqp.core.Message;
import org.springframework.amqp.core.MessageListener;
@@ -61,7 +60,7 @@ public class AmqpInvokerServiceExporter extends RemoteInvocationBasedExporter im
@Override
public void onMessage(Message message) {
Address replyToAddress = AddressUtils.decodeReplyToAddress(message);
Address replyToAddress = message.getMessageProperties().getReplyToAddress();
if (replyToAddress == null) {
throw new AmqpRejectAndDontRequeueException("No replyToAddress in inbound AMQP Message");
}

2
spring-amqp/src/test/java/org/springframework/amqp/core/AddressTests.java
View File

@@ -90,7 +90,7 @@ public class AddressTests {
MessageProperties props = new MessageProperties();
props.setReplyTo(replyTo);
Message message = new Message("foo".getBytes(), props);
Address address = AddressUtils.decodeReplyToAddress(message);
Address address = message.getMessageProperties().getReplyToAddress();
assertEquals("", address.getExchangeName());
assertEquals(replyTo, address.getRoutingKey());
address = props.getReplyToAddress();

3
spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitTemplate.java
View File

@@ -33,7 +33,6 @@ import org.springframework.amqp.AmqpException;
import org.springframework.amqp.AmqpIllegalStateException;
import org.springframework.amqp.AmqpRejectAndDontRequeueException;
import org.springframework.amqp.core.Address;
import org.springframework.amqp.core.AddressUtils;
import org.springframework.amqp.core.Message;
import org.springframework.amqp.core.MessageListener;
import org.springframework.amqp.core.MessagePostProcessor;
@@ -1164,7 +1163,7 @@ public class RabbitTemplate extends RabbitAccessor
* @see org.springframework.amqp.core.MessageProperties#getReplyTo()
*/
private Address getReplyToAddress(Message request) throws AmqpException {
Address replyTo = AddressUtils.decodeReplyToAddress(request);
Address replyTo = request.getMessageProperties().getReplyToAddress();
if (replyTo == null) {
if (this.exchange == null) {
throw new AmqpException(

3
spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/adapter/AbstractAdaptableMessageListener.java
View File

@@ -21,7 +21,6 @@ import org.apache.commons.logging.LogFactory;
import org.springframework.amqp.AmqpException;
import org.springframework.amqp.core.Address;
import org.springframework.amqp.core.AddressUtils;
import org.springframework.amqp.core.Message;
import org.springframework.amqp.core.MessageListener;
import org.springframework.amqp.core.MessagePostProcessor;
@@ -284,7 +283,7 @@ public abstract class AbstractAdaptableMessageListener implements MessageListene
* @see org.springframework.amqp.core.MessageProperties#getReplyTo()
*/
protected Address getReplyToAddress(Message request) throws Exception {
Address replyTo = AddressUtils.decodeReplyToAddress(request);
Address replyTo = request.getMessageProperties().getReplyToAddress();
if (replyTo == null) {
if (this.responseExchange == null) {
throw new AmqpException(