From 5c3a690cb467e41dde29a4a111b088780c4ff157 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Mon, 5 Jun 2017 18:28:44 -0400 Subject: [PATCH] Rename AMQP_MESSAGE to AMQP_RAW_MESSAGE See: spring-cloud/spring-cloud-stream#913 To make compatibility with Spring AMQP 2.0 `AmqpHeaders.RAW_MESSAGE` rename `AmqpMessageHeaderErrorMessageStrategy.AMQP_MESSAGE` constant to the `AMQP_RAW_MESSAGE` and therefore its value to the `AmqpHeaders.PREFIX + "raw_message"` See https://github.com/spring-projects/spring-amqp/commit/c10092d0c54a4337e7b56378392757b3f3419201 --- .../support/AmqpMessageHeaderErrorMessageStrategy.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/support/AmqpMessageHeaderErrorMessageStrategy.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/support/AmqpMessageHeaderErrorMessageStrategy.java index 807461f22f..52375d8d0c 100644 --- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/support/AmqpMessageHeaderErrorMessageStrategy.java +++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/support/AmqpMessageHeaderErrorMessageStrategy.java @@ -19,6 +19,7 @@ package org.springframework.integration.amqp.support; import java.util.Collections; import java.util.Map; +import org.springframework.amqp.support.AmqpHeaders; import org.springframework.core.AttributeAccessor; import org.springframework.integration.support.ErrorMessageStrategy; import org.springframework.integration.support.ErrorMessageUtils; @@ -38,15 +39,15 @@ public class AmqpMessageHeaderErrorMessageStrategy implements ErrorMessageStrate /** * Header name/retry context variable for the raw received message. */ - public static final String AMQP_MESSAGE = "amqp_message"; // move to AmqpHeaders.MESSAGE in 2.0 + public static final String AMQP_RAW_MESSAGE = AmqpHeaders.PREFIX + "raw_message"; @SuppressWarnings("deprecation") @Override public ErrorMessage buildErrorMessage(Throwable throwable, AttributeAccessor context) { Object inputMessage = context.getAttribute(ErrorMessageUtils.INPUT_MESSAGE_CONTEXT_KEY); Map headers = Collections.singletonMap( - AmqpMessageHeaderErrorMessageStrategy.AMQP_MESSAGE, - context.getAttribute(AmqpMessageHeaderErrorMessageStrategy.AMQP_MESSAGE)); + AmqpMessageHeaderErrorMessageStrategy.AMQP_RAW_MESSAGE, + context.getAttribute(AmqpMessageHeaderErrorMessageStrategy.AMQP_RAW_MESSAGE)); return inputMessage instanceof Message ? new org.springframework.integration.message.EnhancedErrorMessage(throwable, headers, (Message) inputMessage)