From c8d66d24fac48d2c69f22e35545384337df8cd97 Mon Sep 17 00:00:00 2001 From: Romster Date: Thu, 22 Mar 2018 19:08:05 +0300 Subject: [PATCH] AMQP-805: protected postProcessMessageBeforeSend JIRA: https://jira.spring.io/browse/AMQP-805 Fixes https://github.com/spring-projects/spring-amqp/issues/722 The `AmqpAppender.postProcessMessageBeforeSend()` is `public` and uses a `protected` `Event` API. This combination is useless when we use it from outside call and also it is clashes with Kotlin * Make `postProcessMessageBeforeSend()` as `protected` because it's never been designed for public usage. **Cherry-pick to 2.0.x, master** --- .../org/springframework/amqp/rabbit/log4j2/AmqpAppender.java | 2 +- .../org/springframework/amqp/rabbit/logback/AmqpAppender.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/log4j2/AmqpAppender.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/log4j2/AmqpAppender.java index f283c02e..97c6e8b2 100644 --- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/log4j2/AmqpAppender.java +++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/log4j2/AmqpAppender.java @@ -231,7 +231,7 @@ public class AmqpAppender extends AbstractAppender { * @param event The event. * @return The modified message. */ - public Message postProcessMessageBeforeSend(Message message, Event event) { + protected Message postProcessMessageBeforeSend(Message message, Event event) { return message; } diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/logback/AmqpAppender.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/logback/AmqpAppender.java index 33d569e6..bf33c3d7 100644 --- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/logback/AmqpAppender.java +++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/logback/AmqpAppender.java @@ -540,7 +540,7 @@ public class AmqpAppender extends AppenderBase { * @return The modified message. * @since 1.4 */ - public Message postProcessMessageBeforeSend(Message message, Event event) { + protected Message postProcessMessageBeforeSend(Message message, Event event) { return message; }