[camel] 11/12: CAMEL-15105: move the default consumer callback instance to the extension

[orpiske]

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 <angusyo...@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