You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pp...@apache.org on 2021/07/22 15:08:05 UTC

[camel-quarkus] 02/02: Fixup 8522d9f Test removeProperty() and removeProperties() EIP DSL methods #2628

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

ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git

commit 0469ce64e90a957697bc815ec1ab5b640deb1e22
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Thu Jul 22 14:10:58 2021 +0200

    Fixup 8522d9f Test removeProperty() and removeProperties() EIP DSL methods #2628
---
 .../org/apache/camel/quarkus/eip/it/EipRoutes.java    | 19 ++++++++++++++++---
 .../java/org/apache/camel/quarkus/eip/it/EipTest.java |  4 ++--
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/integration-test-groups/foundation/eip/src/main/java/org/apache/camel/quarkus/eip/it/EipRoutes.java b/integration-test-groups/foundation/eip/src/main/java/org/apache/camel/quarkus/eip/it/EipRoutes.java
index 52229d1..027a174 100644
--- a/integration-test-groups/foundation/eip/src/main/java/org/apache/camel/quarkus/eip/it/EipRoutes.java
+++ b/integration-test-groups/foundation/eip/src/main/java/org/apache/camel/quarkus/eip/it/EipRoutes.java
@@ -20,6 +20,7 @@ import javax.enterprise.inject.Produces;
 import javax.inject.Named;
 import javax.inject.Singleton;
 
+import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.model.ClaimCheckOperation;
 import org.apache.camel.processor.loadbalancer.RoundRobinLoadBalancer;
@@ -68,9 +69,21 @@ public class EipRoutes extends RouteBuilder {
 
         from("direct:removeHeaders").removeHeaders("headerToRemove.*").to("mock:removeHeaders");
 
-        from("direct:removeProperty").removeHeader("propertyToRemove").to("mock:removeProperty");
-
-        from("direct:removeProperties").removeHeaders("propertyToRemove.*").to("mock:removeProperties");
+        final Processor headersToProperties = e -> {
+            e.getMessage().getHeaders().entrySet().stream()
+                    .filter(en -> en.getKey().contains("roperty"))
+                    .forEach(en -> e.getProperties().put(en.getKey(), en.getValue()));
+            ;
+        };
+        from("direct:removeProperty")
+                .process(headersToProperties)
+                .removeProperty("propertyToRemove")
+                .to("mock:removeProperty");
+
+        from("direct:removeProperties")
+                .process(headersToProperties)
+                .removeProperties("propertyToRemove.*")
+                .to("mock:removeProperties");
 
     }
 
diff --git a/integration-test-groups/foundation/eip/src/test/java/org/apache/camel/quarkus/eip/it/EipTest.java b/integration-test-groups/foundation/eip/src/test/java/org/apache/camel/quarkus/eip/it/EipTest.java
index 18e78cc..9b5ad62 100644
--- a/integration-test-groups/foundation/eip/src/test/java/org/apache/camel/quarkus/eip/it/EipTest.java
+++ b/integration-test-groups/foundation/eip/src/test/java/org/apache/camel/quarkus/eip/it/EipTest.java
@@ -222,7 +222,7 @@ class EipTest {
                 .then()
                 .statusCode(200);
 
-        RestAssured.get("/eip/mock/removeProperty/1/5000/header")
+        RestAssured.get("/eip/mock/removeProperty/1/5000/property")
                 .then()
                 .statusCode(200)
                 .body(
@@ -244,7 +244,7 @@ class EipTest {
                 .then()
                 .statusCode(200);
 
-        RestAssured.get("/eip/mock/removeProperties/1/5000/header")
+        RestAssured.get("/eip/mock/removeProperties/1/5000/property")
                 .then()
                 .statusCode(200)
                 .body(