[camel] branch camel-4.0.x updated: CAMEL-19859: camel-spring-rabbitmq set headerfilter not effective (#11404) (#11410)

[orpiske]

This is an automated email from the ASF dual-hosted git repository.

orpiske pushed a commit to branch camel-4.0.x
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/camel-4.0.x by this push:
     new c30cc75cf52 CAMEL-19859: camel-spring-rabbitmq set headerfilter not 
effective (#11404) (#11410)
c30cc75cf52 is described below

commit c30cc75cf52679f134127a79f989473127ec9173
Author: Otavio Rodolfo Piske <orpi...@users.noreply.github.com>
AuthorDate: Sun Sep 17 12:39:19 2023 +0200

    CAMEL-19859: camel-spring-rabbitmq set headerfilter not effective (#11404) 
(#11410)
---
 .../springrabbit/DefaultMessagePropertiesConverter.java        | 10 +++++++---
 .../component/springrabbit/MessagePropertiesConverter.java     |  2 ++
 .../camel/component/springrabbit/SpringRabbitMQComponent.java  |  3 ++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git 
a/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/DefaultMessagePropertiesConverter.java
 
b/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/DefaultMessagePropertiesConverter.java
index 87343d20820..2087339ca37 100644
--- 
a/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/DefaultMessagePropertiesConverter.java
+++ 
b/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/DefaultMessagePropertiesConverter.java
@@ -31,11 +31,10 @@ import org.springframework.amqp.core.MessageProperties;
 public class DefaultMessagePropertiesConverter implements 
MessagePropertiesConverter {
 
     private final CamelContext camelContext;
-    private final HeaderFilterStrategy headerFilterStrategy;
+    private HeaderFilterStrategy headerFilterStrategy;
 
-    public DefaultMessagePropertiesConverter(CamelContext camelContext, 
HeaderFilterStrategy headerFilterStrategy) {
+    public DefaultMessagePropertiesConverter(CamelContext camelContext) {
         this.camelContext = camelContext;
-        this.headerFilterStrategy = headerFilterStrategy;
     }
 
     @Override
@@ -181,6 +180,11 @@ public class DefaultMessagePropertiesConverter implements 
MessagePropertiesConve
         return answer;
     }
 
+    @Override
+    public void setHeaderFilterStrategy(HeaderFilterStrategy 
headerFilterStrategy) {
+        this.headerFilterStrategy = headerFilterStrategy;
+    }
+
     private void appendOutputHeader(MessageProperties answer, String 
headerName, Object headerValue, Exchange ex) {
         if (shouldOutputHeader(headerName, headerValue, ex)) {
             answer.setHeader(headerName, headerValue);
diff --git 
a/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/MessagePropertiesConverter.java
 
b/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/MessagePropertiesConverter.java
index 38fc11786db..55850c0fbae 100644
--- 
a/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/MessagePropertiesConverter.java
+++ 
b/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/MessagePropertiesConverter.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.springrabbit;
 import java.util.Map;
 
 import org.apache.camel.Exchange;
+import org.apache.camel.spi.HeaderFilterStrategy;
 import org.springframework.amqp.core.MessageProperties;
 
 public interface MessagePropertiesConverter {
@@ -27,4 +28,5 @@ public interface MessagePropertiesConverter {
 
     Map<String, Object> fromMessageProperties(MessageProperties 
messageProperties, Exchange exchange);
 
+    void setHeaderFilterStrategy(HeaderFilterStrategy headerFilterStrategy);
 }
diff --git 
a/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/SpringRabbitMQComponent.java
 
b/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/SpringRabbitMQComponent.java
index 6bcc3d57271..e54d3789ef7 100644
--- 
a/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/SpringRabbitMQComponent.java
+++ 
b/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/SpringRabbitMQComponent.java
@@ -124,7 +124,7 @@ public class SpringRabbitMQComponent extends 
HeaderFilterStrategyComponent {
             messageConverter = new DefaultMessageConverter(getCamelContext());
         }
         if (messagePropertiesConverter == null) {
-            messagePropertiesConverter = new 
DefaultMessagePropertiesConverter(getCamelContext(), getHeaderFilterStrategy());
+            messagePropertiesConverter = new 
DefaultMessagePropertiesConverter(getCamelContext());
         }
     }
 
@@ -134,6 +134,7 @@ public class SpringRabbitMQComponent extends 
HeaderFilterStrategyComponent {
         endpoint.setConnectionFactory(connectionFactory);
         endpoint.setTestConnectionOnStartup(testConnectionOnStartup);
         endpoint.setMessageConverter(messageConverter);
+        
messagePropertiesConverter.setHeaderFilterStrategy(getHeaderFilterStrategy());
         endpoint.setMessagePropertiesConverter(messagePropertiesConverter);
         endpoint.setAutoStartup(autoStartup);
         endpoint.setAutoDeclare(autoDeclare);