This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new bcdc6334a1a CAMEL-19817: camel-timer - Remove firedTime header and
turn off metadata headers by default to make the exchange empty, and avoid
leaking unwanted headers by default. Add backwards compatible option on
component to turn this on globally.
bcdc6334a1a is described below
commit bcdc6334a1aec18b6a689b0cc2cb63f682021466
Author: Claus Ibsen <[email protected]>
AuthorDate: Fri Sep 1 09:30:30 2023 +0200
CAMEL-19817: camel-timer - Remove firedTime header and turn off metadata
headers by default to make the exchange empty, and avoid leaking unwanted
headers by default. Add backwards compatible option on component to turn this
on globally.
---
.../reactor/engine/ReactorStreamsServiceBackpressureTest.java | 6 +++---
.../camel/component/reactor/engine/ReactorStreamsServiceTest.java | 6 +++---
.../rxjava/engine/RxJavaStreamsServiceBackpressureTest.java | 6 +++---
.../camel/component/rxjava/engine/RxJavaStreamsServiceTest.java | 8 +++++---
4 files changed, 14 insertions(+), 12 deletions(-)
diff --git
a/components/camel-reactor/src/test/java/org/apache/camel/component/reactor/engine/ReactorStreamsServiceBackpressureTest.java
b/components/camel-reactor/src/test/java/org/apache/camel/component/reactor/engine/ReactorStreamsServiceBackpressureTest.java
index 6391af2ac63..57089ac2dc9 100644
---
a/components/camel-reactor/src/test/java/org/apache/camel/component/reactor/engine/ReactorStreamsServiceBackpressureTest.java
+++
b/components/camel-reactor/src/test/java/org/apache/camel/component/reactor/engine/ReactorStreamsServiceBackpressureTest.java
@@ -40,7 +40,7 @@ public class ReactorStreamsServiceBackpressureTest extends
ReactorStreamsService
context.addRoutes(new RouteBuilder() {
@Override
public void configure() {
- from("timer:gen?period=20&repeatCount=20")
+ from("timer:gen?period=20&repeatCount=20&includeMetadata=true")
.setBody()
.header(Exchange.TIMER_COUNTER)
.to("reactive-streams:integers");
@@ -75,7 +75,7 @@ public class ReactorStreamsServiceBackpressureTest extends
ReactorStreamsService
context.addRoutes(new RouteBuilder() {
@Override
public void configure() {
- from("timer:gen?period=20&repeatCount=20")
+ from("timer:gen?period=20&repeatCount=20&includeMetadata=true")
.setBody()
.header(Exchange.TIMER_COUNTER)
.to("reactive-streams:integers");
@@ -122,7 +122,7 @@ public class ReactorStreamsServiceBackpressureTest extends
ReactorStreamsService
context.addRoutes(new RouteBuilder() {
@Override
public void configure() {
- from("timer:gen?period=20&repeatCount=20")
+ from("timer:gen?period=20&repeatCount=20&includeMetadata=true")
.setBody()
.header(Exchange.TIMER_COUNTER)
.to("reactive-streams:integers");
diff --git
a/components/camel-reactor/src/test/java/org/apache/camel/component/reactor/engine/ReactorStreamsServiceTest.java
b/components/camel-reactor/src/test/java/org/apache/camel/component/reactor/engine/ReactorStreamsServiceTest.java
index 0cf0d2dffd3..5f73da236f6 100644
---
a/components/camel-reactor/src/test/java/org/apache/camel/component/reactor/engine/ReactorStreamsServiceTest.java
+++
b/components/camel-reactor/src/test/java/org/apache/camel/component/reactor/engine/ReactorStreamsServiceTest.java
@@ -89,7 +89,7 @@ public class ReactorStreamsServiceTest extends
ReactorStreamsServiceTestSupport
context.addRoutes(new RouteBuilder() {
@Override
public void configure() {
- from("timer:tick?period=5&repeatCount=30")
+ from("timer:tick?period=5&repeatCount=30&includeMetadata=true")
.setBody()
.header(Exchange.TIMER_COUNTER)
.to("reactive-streams:tick");
@@ -145,7 +145,7 @@ public class ReactorStreamsServiceTest extends
ReactorStreamsServiceTestSupport
context.addRoutes(new RouteBuilder() {
@Override
public void configure() {
- from("timer:tick?period=50")
+ from("timer:tick?period=50&includeMetadata=true")
.setBody().header(Exchange.TIMER_COUNTER)
.to("reactive-streams:tick");
}
@@ -182,7 +182,7 @@ public class ReactorStreamsServiceTest extends
ReactorStreamsServiceTestSupport
public void testFrom() throws Exception {
context.start();
- Publisher<Exchange> timer =
crs.from("timer:reactive?period=250&repeatCount=3");
+ Publisher<Exchange> timer =
crs.from("timer:reactive?period=250&repeatCount=3&includeMetadata=true");
AtomicInteger value = new AtomicInteger();
CountDownLatch latch = new CountDownLatch(3);
diff --git
a/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceBackpressureTest.java
b/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceBackpressureTest.java
index 28e1882e389..35cedae60ed 100644
---
a/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceBackpressureTest.java
+++
b/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceBackpressureTest.java
@@ -39,7 +39,7 @@ public class RxJavaStreamsServiceBackpressureTest extends
RxJavaStreamsServiceTe
context.addRoutes(new RouteBuilder() {
@Override
public void configure() {
- from("timer:gen?period=20&repeatCount=20")
+ from("timer:gen?period=20&repeatCount=20&includeMetadata=true")
.setBody()
.header(Exchange.TIMER_COUNTER)
.to("reactive-streams:integers");
@@ -74,7 +74,7 @@ public class RxJavaStreamsServiceBackpressureTest extends
RxJavaStreamsServiceTe
context.addRoutes(new RouteBuilder() {
@Override
public void configure() {
- from("timer:gen?period=20&repeatCount=20")
+ from("timer:gen?period=20&repeatCount=20&includeMetadata=true")
.setBody()
.header(Exchange.TIMER_COUNTER)
.to("reactive-streams:integers");
@@ -121,7 +121,7 @@ public class RxJavaStreamsServiceBackpressureTest extends
RxJavaStreamsServiceTe
context.addRoutes(new RouteBuilder() {
@Override
public void configure() {
- from("timer:gen?period=20&repeatCount=20")
+ from("timer:gen?period=20&repeatCount=20&includeMetadata=true")
.setBody()
.header(Exchange.TIMER_COUNTER)
.to("reactive-streams:integers");
diff --git
a/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceTest.java
b/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceTest.java
index 98ccf5af5be..200351bf383 100644
---
a/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceTest.java
+++
b/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceTest.java
@@ -80,7 +80,8 @@ public class RxJavaStreamsServiceTest extends
RxJavaStreamsServiceTestSupport {
context.addRoutes(new RouteBuilder() {
@Override
public void configure() {
-
from("timer:tick?period=5&repeatCount=30").setBody().header(Exchange.TIMER_COUNTER).to("reactive-streams:tick");
+
from("timer:tick?period=5&repeatCount=30&includeMetadata=true").setBody().header(Exchange.TIMER_COUNTER)
+ .to("reactive-streams:tick");
}
});
@@ -127,7 +128,8 @@ public class RxJavaStreamsServiceTest extends
RxJavaStreamsServiceTestSupport {
context.addRoutes(new RouteBuilder() {
@Override
public void configure() {
-
from("timer:tick?period=50").setBody().header(Exchange.TIMER_COUNTER).to("reactive-streams:tick");
+
from("timer:tick?period=50&includeMetadata=true").setBody().header(Exchange.TIMER_COUNTER)
+ .to("reactive-streams:tick");
}
});
@@ -162,7 +164,7 @@ public class RxJavaStreamsServiceTest extends
RxJavaStreamsServiceTestSupport {
public void testFrom() throws Exception {
context.start();
- Publisher<Exchange> timer =
crs.from("timer:reactive?period=250&repeatCount=3");
+ Publisher<Exchange> timer =
crs.from("timer:reactive?period=250&repeatCount=3&includeMetadata=true");
AtomicInteger value = new AtomicInteger();
CountDownLatch latch = new CountDownLatch(3);
