You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2023/04/26 17:58:18 UTC
[camel] branch main updated (4c1f2f29cc8 -> 1e7715192a0)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from 4c1f2f29cc8 (chores) style: disable checkstyle on auto-generated files in camel-xml-jaxb-dsl
new 466b8f67c2a CAMEL-15105: move the fromRouteId to the extension
new 93b6dab2904 CAMEL-15105: move the stream cache flag to the extension
new ddcb672460c CAMEL-15105: move the re-delivery exhausted flag to the extension
new f4b502bee09 CAMEL-15105: move the history node id flag to the extension
new 8ebfb88e57d CAMEL-15105: move the history node source flag to the extension
new 40cae08f4cb CAMEL-15105: move the history node label to the extension
new 7b0ff81957b CAMEL-15105: move the transacted flag to the extension
new 374d2f30ba4 CAMEL-15105: move the notify event flag to the extension
new 382a201fbbb CAMEL-15105: move the interruptable flag to the extension
new 760c15b0594 CAMEL-15105: move the interrupted flag to the extension
new 0ace438fdb0 CAMEL-15105: move the default consumer callback instance to the extension
new 1e7715192a0 CAMEL-15105: cleaned up resetting the extension
The 12 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/camel/support/AbstractExchange.java | 39 +++---------
.../camel/support/DefaultPooledExchange.java | 11 +---
.../camel/support/ExtendedExchangeExtension.java | 71 ++++++++++++++++------
3 files changed, 61 insertions(+), 60 deletions(-)
[camel] 07/12: CAMEL-15105: move the transacted flag to the extension
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 7b0ff81957b01736ae293d7a9b91fded8db800f9
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Wed Apr 26 18:40:37 2023 +0200
CAMEL-15105: move the transacted flag to the extension
---
.../src/main/java/org/apache/camel/support/AbstractExchange.java | 3 +--
.../main/java/org/apache/camel/support/DefaultPooledExchange.java | 2 +-
.../java/org/apache/camel/support/ExtendedExchangeExtension.java | 7 ++++++-
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java b/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
index 60c8299e9a4..f26711aa6f7 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
@@ -70,7 +70,6 @@ class AbstractExchange implements Exchange {
ExchangePattern pattern;
List<Synchronization> onCompletions;
Boolean externalRedelivered;
- boolean transacted;
boolean routeStop;
boolean rollbackOnly;
boolean rollbackOnlyLast;
@@ -630,7 +629,7 @@ class AbstractExchange implements Exchange {
@Override
public boolean isTransacted() {
- return transacted;
+ return privateExtension.isTransacted();
}
@Override
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/DefaultPooledExchange.java b/core/camel-support/src/main/java/org/apache/camel/support/DefaultPooledExchange.java
index 00bbbebfe2f..d80972babd7 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/DefaultPooledExchange.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/DefaultPooledExchange.java
@@ -112,7 +112,7 @@ public final class DefaultPooledExchange extends AbstractExchange implements Poo
this.externalRedelivered = null;
getExchangeExtension().setHistoryNodeId(null);
getExchangeExtension().setHistoryNodeLabel(null);
- this.transacted = false;
+ getExchangeExtension().setTransacted(false);
this.routeStop = false;
this.rollbackOnly = false;
this.rollbackOnlyLast = false;
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java b/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java
index b59fb811e28..baf4aece5ac 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java
@@ -39,6 +39,7 @@ public class ExtendedExchangeExtension implements ExchangeExtension {
private String historyNodeId;
private String historyNodeSource;
private String historyNodeLabel;
+ private boolean transacted;
ExtendedExchangeExtension(AbstractExchange exchange) {
this.exchange = exchange;
@@ -189,7 +190,11 @@ public class ExtendedExchangeExtension implements ExchangeExtension {
@Override
public void setTransacted(boolean transacted) {
- this.exchange.transacted = transacted;
+ this.transacted = transacted;
+ }
+
+ public boolean isTransacted() {
+ return transacted;
}
@Override
[camel] 09/12: CAMEL-15105: move the interruptable flag to the extension
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 382a201fbbbb9443a8d8110e97a55c85a901be3c
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Wed Apr 26 18:42:52 2023 +0200
CAMEL-15105: move the interruptable flag to the extension
---
.../src/main/java/org/apache/camel/support/AbstractExchange.java | 3 +--
.../main/java/org/apache/camel/support/DefaultPooledExchange.java | 2 +-
.../java/org/apache/camel/support/ExtendedExchangeExtension.java | 7 ++++++-
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java b/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
index 1c204d3444e..28e267bbf82 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
@@ -74,7 +74,6 @@ class AbstractExchange implements Exchange {
boolean rollbackOnly;
boolean rollbackOnlyLast;
boolean interrupted;
- boolean interruptable = true;
AsyncCallback defaultConsumerCallback; // optimize (do not reset)
Map<String, SafeCopyProperty> safeCopyProperties;
private final ExtendedExchangeExtension privateExtension;
@@ -747,7 +746,7 @@ class AbstractExchange implements Exchange {
}
void setInterrupted(boolean interrupted) {
- if (interruptable) {
+ if (privateExtension.isInterruptable()) {
this.interrupted = interrupted;
}
}
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/DefaultPooledExchange.java b/core/camel-support/src/main/java/org/apache/camel/support/DefaultPooledExchange.java
index f0028d111eb..74e4a16ac52 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/DefaultPooledExchange.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/DefaultPooledExchange.java
@@ -118,7 +118,7 @@ public final class DefaultPooledExchange extends AbstractExchange implements Poo
this.rollbackOnlyLast = false;
getExchangeExtension().setNotifyEvent(false);
this.interrupted = false;
- this.interruptable = true;
+ getExchangeExtension().setInterruptable(true);
getExchangeExtension().setRedeliveryExhausted(false);
getExchangeExtension().setErrorHandlerHandled(null);
getExchangeExtension().setStreamCacheDisabled(false);
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java b/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java
index e20fed36bf0..34836f3de90 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java
@@ -41,6 +41,7 @@ public class ExtendedExchangeExtension implements ExchangeExtension {
private String historyNodeLabel;
private boolean transacted;
private boolean notifyEvent;
+ private boolean interruptable = true;
ExtendedExchangeExtension(AbstractExchange exchange) {
this.exchange = exchange;
@@ -200,7 +201,11 @@ public class ExtendedExchangeExtension implements ExchangeExtension {
@Override
public void setInterruptable(boolean interruptable) {
- this.exchange.interruptable = interruptable;
+ this.interruptable = interruptable;
+ }
+
+ public boolean isInterruptable() {
+ return interruptable;
}
@Override
[camel] 10/12: CAMEL-15105: move the interrupted flag to the extension
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 760c15b059494712a07c96940c5bb4e5b380e271
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Wed Apr 26 18:46:05 2023 +0200
CAMEL-15105: move the interrupted flag to the extension
---
.../main/java/org/apache/camel/support/AbstractExchange.java | 9 +--------
.../java/org/apache/camel/support/DefaultPooledExchange.java | 2 +-
.../org/apache/camel/support/ExtendedExchangeExtension.java | 11 +++++------
3 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java b/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
index 28e267bbf82..be7d6bb6d97 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
@@ -73,7 +73,6 @@ class AbstractExchange implements Exchange {
boolean routeStop;
boolean rollbackOnly;
boolean rollbackOnlyLast;
- boolean interrupted;
AsyncCallback defaultConsumerCallback; // optimize (do not reset)
Map<String, SafeCopyProperty> safeCopyProperties;
private final ExtendedExchangeExtension privateExtension;
@@ -583,7 +582,7 @@ class AbstractExchange implements Exchange {
}
if (t instanceof InterruptedException) {
// mark the exchange as interrupted due to the interrupt exception
- setInterrupted(true);
+ privateExtension.setInterrupted(true);
}
}
@@ -745,12 +744,6 @@ class AbstractExchange implements Exchange {
return answer;
}
- void setInterrupted(boolean interrupted) {
- if (privateExtension.isInterruptable()) {
- this.interrupted = interrupted;
- }
- }
-
/**
* Configures the message after it has been set on the exchange
*/
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/DefaultPooledExchange.java b/core/camel-support/src/main/java/org/apache/camel/support/DefaultPooledExchange.java
index 74e4a16ac52..5b0dbc2795f 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/DefaultPooledExchange.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/DefaultPooledExchange.java
@@ -117,7 +117,7 @@ public final class DefaultPooledExchange extends AbstractExchange implements Poo
this.rollbackOnly = false;
this.rollbackOnlyLast = false;
getExchangeExtension().setNotifyEvent(false);
- this.interrupted = false;
+ getExchangeExtension().setInterrupted(false);
getExchangeExtension().setInterruptable(true);
getExchangeExtension().setRedeliveryExhausted(false);
getExchangeExtension().setErrorHandlerHandled(null);
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java b/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java
index 34836f3de90..e72395c2989 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java
@@ -42,6 +42,7 @@ public class ExtendedExchangeExtension implements ExchangeExtension {
private boolean transacted;
private boolean notifyEvent;
private boolean interruptable = true;
+ private boolean interrupted;
ExtendedExchangeExtension(AbstractExchange exchange) {
this.exchange = exchange;
@@ -204,18 +205,16 @@ public class ExtendedExchangeExtension implements ExchangeExtension {
this.interruptable = interruptable;
}
- public boolean isInterruptable() {
- return interruptable;
- }
-
@Override
public boolean isInterrupted() {
- return this.exchange.interrupted;
+ return this.interrupted;
}
@Override
public void setInterrupted(boolean interrupted) {
- this.exchange.setInterrupted(interrupted);
+ if (interruptable) {
+ this.interrupted = interrupted;
+ }
}
@Override
[camel] 11/12: CAMEL-15105: move the default consumer callback instance to the extension
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0ace438fdb0ac8f8d0d00f983c7da51149f1389c
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Wed Apr 26 18:48:13 2023 +0200
CAMEL-15105: move the default consumer callback instance to the extension
---
.../src/main/java/org/apache/camel/support/AbstractExchange.java | 9 ---------
.../java/org/apache/camel/support/ExtendedExchangeExtension.java | 5 +++--
2 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java b/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
index be7d6bb6d97..ba484068884 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
@@ -73,7 +73,6 @@ class AbstractExchange implements Exchange {
boolean routeStop;
boolean rollbackOnly;
boolean rollbackOnlyLast;
- AsyncCallback defaultConsumerCallback; // optimize (do not reset)
Map<String, SafeCopyProperty> safeCopyProperties;
private final ExtendedExchangeExtension privateExtension;
@@ -776,14 +775,6 @@ class AbstractExchange implements Exchange {
return map;
}
- public AsyncCallback getDefaultConsumerCallback() {
- return defaultConsumerCallback;
- }
-
- public void setDefaultConsumerCallback(AsyncCallback defaultConsumerCallback) {
- this.defaultConsumerCallback = defaultConsumerCallback;
- }
-
protected String createExchangeId() {
return context.getUuidGenerator().generateExchangeUuid();
}
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java b/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java
index e72395c2989..5265a008cd0 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java
@@ -43,6 +43,7 @@ public class ExtendedExchangeExtension implements ExchangeExtension {
private boolean notifyEvent;
private boolean interruptable = true;
private boolean interrupted;
+ private AsyncCallback defaultConsumerCallback; // optimize (do not reset)
ExtendedExchangeExtension(AbstractExchange exchange) {
this.exchange = exchange;
@@ -224,12 +225,12 @@ public class ExtendedExchangeExtension implements ExchangeExtension {
@Override
public AsyncCallback getDefaultConsumerCallback() {
- return this.exchange.defaultConsumerCallback;
+ return this.defaultConsumerCallback;
}
@Override
public void setDefaultConsumerCallback(AsyncCallback callback) {
- this.exchange.defaultConsumerCallback = callback;
+ this.defaultConsumerCallback = callback;
}
@Override
[camel] 02/12: CAMEL-15105: move the stream cache flag to the extension
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 93b6dab2904dc46e23677ab6347108aee750de2c
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Wed Apr 26 18:25:11 2023 +0200
CAMEL-15105: move the stream cache flag to the extension
---
.../src/main/java/org/apache/camel/support/AbstractExchange.java | 3 +--
.../main/java/org/apache/camel/support/DefaultPooledExchange.java | 2 +-
.../java/org/apache/camel/support/ExtendedExchangeExtension.java | 5 +++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java b/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
index 0e587225a30..6c8ec5b966d 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
@@ -81,7 +81,6 @@ class AbstractExchange implements Exchange {
boolean interrupted;
boolean interruptable = true;
boolean redeliveryExhausted;
- boolean streamCacheDisabled;
AsyncCallback defaultConsumerCallback; // optimize (do not reset)
Map<String, SafeCopyProperty> safeCopyProperties;
private final ExtendedExchangeExtension privateExtension;
@@ -157,7 +156,7 @@ class AbstractExchange implements Exchange {
newExchangeExtension.setNotifyEvent(notifyEvent);
newExchangeExtension.setRedeliveryExhausted(redeliveryExhausted);
newExchangeExtension.setErrorHandlerHandled(getExchangeExtension().getErrorHandlerHandled());
- newExchangeExtension.setStreamCacheDisabled(streamCacheDisabled);
+ newExchangeExtension.setStreamCacheDisabled(getExchangeExtension().isStreamCacheDisabled());
// copy properties after body as body may trigger lazy init
if (hasProperties()) {
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/DefaultPooledExchange.java b/core/camel-support/src/main/java/org/apache/camel/support/DefaultPooledExchange.java
index fe44c36ef90..4c8790d4f52 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/DefaultPooledExchange.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/DefaultPooledExchange.java
@@ -121,7 +121,7 @@ public final class DefaultPooledExchange extends AbstractExchange implements Poo
this.interruptable = true;
this.redeliveryExhausted = false;
getExchangeExtension().setErrorHandlerHandled(null);
- this.streamCacheDisabled = false;
+ getExchangeExtension().setStreamCacheDisabled(false);
if (onDone != null) {
onDone.onDone(this);
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java b/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java
index 0777a14133e..2d5bb8199ea 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java
@@ -34,6 +34,7 @@ public class ExtendedExchangeExtension implements ExchangeExtension {
private boolean failureHandled;
private Endpoint fromEndpoint;
private String fromRouteId;
+ private boolean streamCacheDisabled;
ExtendedExchangeExtension(AbstractExchange exchange) {
this.exchange = exchange;
@@ -62,14 +63,14 @@ public class ExtendedExchangeExtension implements ExchangeExtension {
* Is stream caching disabled on the given exchange
*/
public boolean isStreamCacheDisabled() {
- return this.exchange.streamCacheDisabled;
+ return this.streamCacheDisabled;
}
/**
* Used to force disabling stream caching which some components can do in special use-cases.
*/
public void setStreamCacheDisabled(boolean streamCacheDisabled) {
- this.exchange.streamCacheDisabled = streamCacheDisabled;
+ this.streamCacheDisabled = streamCacheDisabled;
}
@Override
[camel] 01/12: CAMEL-15105: move the fromRouteId to the extension
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 466b8f67c2abb9fdbe039ffac0d473314a2333ee
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Wed Apr 26 17:20:15 2023 +0200
CAMEL-15105: move the fromRouteId to the extension
---
.../src/main/java/org/apache/camel/support/AbstractExchange.java | 5 ++---
.../java/org/apache/camel/support/ExtendedExchangeExtension.java | 7 ++++++-
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java b/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
index b6ee98fda89..0e587225a30 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
@@ -68,7 +68,6 @@ class AbstractExchange implements Exchange {
String exchangeId;
UnitOfWork unitOfWork;
ExchangePattern pattern;
- String fromRouteId;
List<Synchronization> onCompletions;
Boolean externalRedelivered;
String historyNodeId;
@@ -103,11 +102,11 @@ class AbstractExchange implements Exchange {
this.context = parent.getContext();
this.pattern = parent.getPattern();
this.created = parent.getCreated();
- this.fromRouteId = parent.getFromRouteId();
this.unitOfWork = parent.getUnitOfWork();
privateExtension = new ExtendedExchangeExtension(this);
privateExtension.setFromEndpoint(parent.getFromEndpoint());
+ privateExtension.setFromRouteId(parent.getFromRouteId());
}
public AbstractExchange(Endpoint fromEndpoint) {
@@ -613,7 +612,7 @@ class AbstractExchange implements Exchange {
@Override
public String getFromRouteId() {
- return fromRouteId;
+ return privateExtension.getFromRouteId();
}
@Override
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java b/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java
index 0972267c223..0777a14133e 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java
@@ -33,6 +33,7 @@ public class ExtendedExchangeExtension implements ExchangeExtension {
private Boolean errorHandlerHandled;
private boolean failureHandled;
private Endpoint fromEndpoint;
+ private String fromRouteId;
ExtendedExchangeExtension(AbstractExchange exchange) {
this.exchange = exchange;
@@ -50,7 +51,11 @@ public class ExtendedExchangeExtension implements ExchangeExtension {
@Override
public void setFromRouteId(String fromRouteId) {
- exchange.fromRouteId = fromRouteId;
+ this.fromRouteId = fromRouteId;
+ }
+
+ public String getFromRouteId() {
+ return fromRouteId;
}
/**
[camel] 04/12: CAMEL-15105: move the history node id flag to the extension
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f4b502bee09d4d9fc41241a95af6343c8f9cb535
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Wed Apr 26 18:30:49 2023 +0200
CAMEL-15105: move the history node id flag to the extension
---
.../src/main/java/org/apache/camel/support/AbstractExchange.java | 1 -
.../main/java/org/apache/camel/support/DefaultPooledExchange.java | 2 +-
.../java/org/apache/camel/support/ExtendedExchangeExtension.java | 5 +++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java b/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
index 1f84aaf044c..31da48d4ed9 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
@@ -70,7 +70,6 @@ class AbstractExchange implements Exchange {
ExchangePattern pattern;
List<Synchronization> onCompletions;
Boolean externalRedelivered;
- String historyNodeId;
String historyNodeLabel;
String historyNodeSource;
boolean transacted;
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/DefaultPooledExchange.java b/core/camel-support/src/main/java/org/apache/camel/support/DefaultPooledExchange.java
index 5036d995dc0..9d08bed56d0 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/DefaultPooledExchange.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/DefaultPooledExchange.java
@@ -110,7 +110,7 @@ public final class DefaultPooledExchange extends AbstractExchange implements Poo
}
// do not reset endpoint/fromRouteId as it would be the same consumer/endpoint again
this.externalRedelivered = null;
- this.historyNodeId = null;
+ getExchangeExtension().setHistoryNodeId(null);
this.historyNodeLabel = null;
this.transacted = false;
this.routeStop = false;
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java b/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java
index 0aed71aafd6..10696473c67 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java
@@ -36,6 +36,7 @@ public class ExtendedExchangeExtension implements ExchangeExtension {
private String fromRouteId;
private boolean streamCacheDisabled;
private boolean redeliveryExhausted;
+ private String historyNodeId;
ExtendedExchangeExtension(AbstractExchange exchange) {
this.exchange = exchange;
@@ -136,12 +137,12 @@ public class ExtendedExchangeExtension implements ExchangeExtension {
@Override
public void setHistoryNodeId(String historyNodeId) {
- this.exchange.historyNodeId = historyNodeId;
+ this.historyNodeId = historyNodeId;
}
@Override
public String getHistoryNodeId() {
- return this.exchange.historyNodeId;
+ return this.historyNodeId;
}
@Override
[camel] 05/12: CAMEL-15105: move the history node source flag to the extension
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8ebfb88e57de4c6e759a98d89395a2ba672135dc
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Wed Apr 26 18:35:29 2023 +0200
CAMEL-15105: move the history node source flag to the extension
---
.../src/main/java/org/apache/camel/support/AbstractExchange.java | 1 -
.../java/org/apache/camel/support/ExtendedExchangeExtension.java | 5 +++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java b/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
index 31da48d4ed9..a19e5da1c60 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
@@ -71,7 +71,6 @@ class AbstractExchange implements Exchange {
List<Synchronization> onCompletions;
Boolean externalRedelivered;
String historyNodeLabel;
- String historyNodeSource;
boolean transacted;
boolean routeStop;
boolean rollbackOnly;
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java b/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java
index 10696473c67..ab1f93d6586 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java
@@ -37,6 +37,7 @@ public class ExtendedExchangeExtension implements ExchangeExtension {
private boolean streamCacheDisabled;
private boolean redeliveryExhausted;
private String historyNodeId;
+ private String historyNodeSource;
ExtendedExchangeExtension(AbstractExchange exchange) {
this.exchange = exchange;
@@ -147,12 +148,12 @@ public class ExtendedExchangeExtension implements ExchangeExtension {
@Override
public String getHistoryNodeSource() {
- return this.exchange.historyNodeSource;
+ return this.historyNodeSource;
}
@Override
public void setHistoryNodeSource(String historyNodeSource) {
- this.exchange.historyNodeSource = historyNodeSource;
+ this.historyNodeSource = historyNodeSource;
}
@Override
[camel] 03/12: CAMEL-15105: move the re-delivery exhausted flag to the extension
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ddcb672460c7681527a4accd62f03dd0b663f08e
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Wed Apr 26 18:26:25 2023 +0200
CAMEL-15105: move the re-delivery exhausted flag to the extension
---
.../src/main/java/org/apache/camel/support/AbstractExchange.java | 3 +--
.../main/java/org/apache/camel/support/DefaultPooledExchange.java | 2 +-
.../java/org/apache/camel/support/ExtendedExchangeExtension.java | 5 +++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java b/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
index 6c8ec5b966d..1f84aaf044c 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
@@ -80,7 +80,6 @@ class AbstractExchange implements Exchange {
boolean notifyEvent;
boolean interrupted;
boolean interruptable = true;
- boolean redeliveryExhausted;
AsyncCallback defaultConsumerCallback; // optimize (do not reset)
Map<String, SafeCopyProperty> safeCopyProperties;
private final ExtendedExchangeExtension privateExtension;
@@ -154,7 +153,7 @@ class AbstractExchange implements Exchange {
exchange.setRollbackOnlyLast(rollbackOnlyLast);
final ExtendedExchangeExtension newExchangeExtension = exchange.getExchangeExtension();
newExchangeExtension.setNotifyEvent(notifyEvent);
- newExchangeExtension.setRedeliveryExhausted(redeliveryExhausted);
+ newExchangeExtension.setRedeliveryExhausted(getExchangeExtension().isRedeliveryExhausted());
newExchangeExtension.setErrorHandlerHandled(getExchangeExtension().getErrorHandlerHandled());
newExchangeExtension.setStreamCacheDisabled(getExchangeExtension().isStreamCacheDisabled());
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/DefaultPooledExchange.java b/core/camel-support/src/main/java/org/apache/camel/support/DefaultPooledExchange.java
index 4c8790d4f52..5036d995dc0 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/DefaultPooledExchange.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/DefaultPooledExchange.java
@@ -119,7 +119,7 @@ public final class DefaultPooledExchange extends AbstractExchange implements Poo
this.notifyEvent = false;
this.interrupted = false;
this.interruptable = true;
- this.redeliveryExhausted = false;
+ getExchangeExtension().setRedeliveryExhausted(false);
getExchangeExtension().setErrorHandlerHandled(null);
getExchangeExtension().setStreamCacheDisabled(false);
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java b/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java
index 2d5bb8199ea..0aed71aafd6 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java
@@ -35,6 +35,7 @@ public class ExtendedExchangeExtension implements ExchangeExtension {
private Endpoint fromEndpoint;
private String fromRouteId;
private boolean streamCacheDisabled;
+ private boolean redeliveryExhausted;
ExtendedExchangeExtension(AbstractExchange exchange) {
this.exchange = exchange;
@@ -100,12 +101,12 @@ public class ExtendedExchangeExtension implements ExchangeExtension {
@Override
public boolean isRedeliveryExhausted() {
- return this.exchange.redeliveryExhausted;
+ return this.redeliveryExhausted;
}
@Override
public void setRedeliveryExhausted(boolean redeliveryExhausted) {
- this.exchange.redeliveryExhausted = redeliveryExhausted;
+ this.redeliveryExhausted = redeliveryExhausted;
}
@Override
[camel] 06/12: CAMEL-15105: move the history node label to the extension
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 40cae08f4cbfb358bc784d4218207d868ad6a1a2
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Wed Apr 26 18:36:56 2023 +0200
CAMEL-15105: move the history node label to the extension
---
.../src/main/java/org/apache/camel/support/AbstractExchange.java | 1 -
.../main/java/org/apache/camel/support/DefaultPooledExchange.java | 2 +-
.../java/org/apache/camel/support/ExtendedExchangeExtension.java | 5 +++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java b/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
index a19e5da1c60..60c8299e9a4 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
@@ -70,7 +70,6 @@ class AbstractExchange implements Exchange {
ExchangePattern pattern;
List<Synchronization> onCompletions;
Boolean externalRedelivered;
- String historyNodeLabel;
boolean transacted;
boolean routeStop;
boolean rollbackOnly;
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/DefaultPooledExchange.java b/core/camel-support/src/main/java/org/apache/camel/support/DefaultPooledExchange.java
index 9d08bed56d0..00bbbebfe2f 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/DefaultPooledExchange.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/DefaultPooledExchange.java
@@ -111,7 +111,7 @@ public final class DefaultPooledExchange extends AbstractExchange implements Poo
// do not reset endpoint/fromRouteId as it would be the same consumer/endpoint again
this.externalRedelivered = null;
getExchangeExtension().setHistoryNodeId(null);
- this.historyNodeLabel = null;
+ getExchangeExtension().setHistoryNodeLabel(null);
this.transacted = false;
this.routeStop = false;
this.rollbackOnly = false;
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java b/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java
index ab1f93d6586..b59fb811e28 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java
@@ -38,6 +38,7 @@ public class ExtendedExchangeExtension implements ExchangeExtension {
private boolean redeliveryExhausted;
private String historyNodeId;
private String historyNodeSource;
+ private String historyNodeLabel;
ExtendedExchangeExtension(AbstractExchange exchange) {
this.exchange = exchange;
@@ -158,12 +159,12 @@ public class ExtendedExchangeExtension implements ExchangeExtension {
@Override
public String getHistoryNodeLabel() {
- return this.exchange.historyNodeSource;
+ return this.historyNodeLabel;
}
@Override
public void setHistoryNodeLabel(String historyNodeLabel) {
- this.exchange.historyNodeLabel = historyNodeLabel;
+ this.historyNodeLabel = historyNodeLabel;
}
@Override
[camel] 08/12: CAMEL-15105: move the notify event flag to the extension
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 374d2f30ba4b47066bca98e8bc457b0f2dfa202d
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Wed Apr 26 18:41:01 2023 +0200
CAMEL-15105: move the notify event flag to the extension
---
.../src/main/java/org/apache/camel/support/AbstractExchange.java | 3 +--
.../main/java/org/apache/camel/support/DefaultPooledExchange.java | 2 +-
.../java/org/apache/camel/support/ExtendedExchangeExtension.java | 5 +++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java b/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
index f26711aa6f7..1c204d3444e 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
@@ -73,7 +73,6 @@ class AbstractExchange implements Exchange {
boolean routeStop;
boolean rollbackOnly;
boolean rollbackOnlyLast;
- boolean notifyEvent;
boolean interrupted;
boolean interruptable = true;
AsyncCallback defaultConsumerCallback; // optimize (do not reset)
@@ -148,7 +147,7 @@ class AbstractExchange implements Exchange {
exchange.setRollbackOnly(rollbackOnly);
exchange.setRollbackOnlyLast(rollbackOnlyLast);
final ExtendedExchangeExtension newExchangeExtension = exchange.getExchangeExtension();
- newExchangeExtension.setNotifyEvent(notifyEvent);
+ newExchangeExtension.setNotifyEvent(getExchangeExtension().isNotifyEvent());
newExchangeExtension.setRedeliveryExhausted(getExchangeExtension().isRedeliveryExhausted());
newExchangeExtension.setErrorHandlerHandled(getExchangeExtension().getErrorHandlerHandled());
newExchangeExtension.setStreamCacheDisabled(getExchangeExtension().isStreamCacheDisabled());
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/DefaultPooledExchange.java b/core/camel-support/src/main/java/org/apache/camel/support/DefaultPooledExchange.java
index d80972babd7..f0028d111eb 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/DefaultPooledExchange.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/DefaultPooledExchange.java
@@ -116,7 +116,7 @@ public final class DefaultPooledExchange extends AbstractExchange implements Poo
this.routeStop = false;
this.rollbackOnly = false;
this.rollbackOnlyLast = false;
- this.notifyEvent = false;
+ getExchangeExtension().setNotifyEvent(false);
this.interrupted = false;
this.interruptable = true;
getExchangeExtension().setRedeliveryExhausted(false);
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java b/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java
index baf4aece5ac..e20fed36bf0 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java
@@ -40,6 +40,7 @@ public class ExtendedExchangeExtension implements ExchangeExtension {
private String historyNodeSource;
private String historyNodeLabel;
private boolean transacted;
+ private boolean notifyEvent;
ExtendedExchangeExtension(AbstractExchange exchange) {
this.exchange = exchange;
@@ -170,12 +171,12 @@ public class ExtendedExchangeExtension implements ExchangeExtension {
@Override
public boolean isNotifyEvent() {
- return this.exchange.notifyEvent;
+ return this.notifyEvent;
}
@Override
public void setNotifyEvent(boolean notifyEvent) {
- this.exchange.notifyEvent = notifyEvent;
+ this.notifyEvent = notifyEvent;
}
@Override
[camel] 12/12: CAMEL-15105: cleaned up resetting the extension
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 1e7715192a013e5d554d7c8b9e6ae582dface65c
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Wed Apr 26 19:07:50 2023 +0200
CAMEL-15105: cleaned up resetting the extension
---
.../java/org/apache/camel/support/DefaultPooledExchange.java | 11 ++---------
.../org/apache/camel/support/ExtendedExchangeExtension.java | 12 ++++++++++++
2 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/DefaultPooledExchange.java b/core/camel-support/src/main/java/org/apache/camel/support/DefaultPooledExchange.java
index 5b0dbc2795f..21ac295a2b7 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/DefaultPooledExchange.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/DefaultPooledExchange.java
@@ -110,18 +110,11 @@ public final class DefaultPooledExchange extends AbstractExchange implements Poo
}
// do not reset endpoint/fromRouteId as it would be the same consumer/endpoint again
this.externalRedelivered = null;
- getExchangeExtension().setHistoryNodeId(null);
- getExchangeExtension().setHistoryNodeLabel(null);
- getExchangeExtension().setTransacted(false);
this.routeStop = false;
this.rollbackOnly = false;
this.rollbackOnlyLast = false;
- getExchangeExtension().setNotifyEvent(false);
- getExchangeExtension().setInterrupted(false);
- getExchangeExtension().setInterruptable(true);
- getExchangeExtension().setRedeliveryExhausted(false);
- getExchangeExtension().setErrorHandlerHandled(null);
- getExchangeExtension().setStreamCacheDisabled(false);
+
+ getExchangeExtension().reset();
if (onDone != null) {
onDone.onDone(this);
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java b/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java
index 5265a008cd0..8080af78e0c 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java
@@ -252,4 +252,16 @@ public class ExtendedExchangeExtension implements ExchangeExtension {
public void setFailureHandled(boolean failureHandled) {
this.failureHandled = failureHandled;
}
+
+ public void reset() {
+ setHistoryNodeId(null);
+ setHistoryNodeLabel(null);
+ setTransacted(false);
+ setNotifyEvent(false);
+ setInterrupted(false);
+ setInterruptable(true);
+ setRedeliveryExhausted(false);
+ setErrorHandlerHandled(null);
+ setStreamCacheDisabled(false);
+ }
}