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/02/14 12:54:07 UTC
[camel] 22/23: CAMEL-15105: deprecated and cleaned up the ExtendedExchange API interface
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 94b807e5c5e29f3f337751b23229cc0b1bcc40d5
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Wed Nov 23 08:49:51 2022 +0100
CAMEL-15105: deprecated and cleaned up the ExtendedExchange API interface
---
.../src/main/java/org/apache/camel/Exchange.java | 1 +
.../main/java/org/apache/camel/PooledExchange.java | 2 +-
.../org/apache/camel/support/AbstractExchange.java | 147 ++-------------------
3 files changed, 16 insertions(+), 134 deletions(-)
diff --git a/core/camel-api/src/main/java/org/apache/camel/Exchange.java b/core/camel-api/src/main/java/org/apache/camel/Exchange.java
index 1ad47031e7b..cbd050a93e5 100644
--- a/core/camel-api/src/main/java/org/apache/camel/Exchange.java
+++ b/core/camel-api/src/main/java/org/apache/camel/Exchange.java
@@ -275,6 +275,7 @@ public interface Exchange {
* @param type the type to adapt to
* @return this {@link org.apache.camel.Exchange} adapted to the given type
*/
+ @Deprecated
<T extends Exchange> T adapt(Class<T> type);
/**
diff --git a/core/camel-api/src/main/java/org/apache/camel/PooledExchange.java b/core/camel-api/src/main/java/org/apache/camel/PooledExchange.java
index 0c471a78a51..a1b85aa73ec 100644
--- a/core/camel-api/src/main/java/org/apache/camel/PooledExchange.java
+++ b/core/camel-api/src/main/java/org/apache/camel/PooledExchange.java
@@ -23,7 +23,7 @@ import org.apache.camel.spi.ExchangeFactory;
* internally by Camel for optimizing memory footprint by reusing exchanges created by {@link Consumer}s via
* {@link ExchangeFactory}.
*/
-public interface PooledExchange extends ExtendedExchange {
+public interface PooledExchange extends Exchange {
/**
* Task to execute when the exchange is done.
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 72093d3afae..89883da2690 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
@@ -30,11 +30,9 @@ import org.apache.camel.CamelContext;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
-import org.apache.camel.ExchangeExtension;
import org.apache.camel.ExchangePattern;
import org.apache.camel.ExchangePropertyKey;
import org.apache.camel.ExtendedCamelContext;
-import org.apache.camel.ExtendedExchange;
import org.apache.camel.Message;
import org.apache.camel.MessageHistory;
import org.apache.camel.SafeCopyProperty;
@@ -54,7 +52,7 @@ import static org.apache.camel.support.MessageHelper.copyBody;
*
* @see DefaultExchange
*/
-class AbstractExchange implements ExtendedExchange {
+class AbstractExchange implements Exchange {
// number of elements in array
static final int INTERNAL_LENGTH = ExchangePropertyKey.values().length;
// empty array for reset
@@ -365,8 +363,7 @@ class AbstractExchange implements ExtendedExchange {
}
}
- @Override
- public void setProperties(Map<String, Object> properties) {
+ void setProperties(Map<String, Object> properties) {
if (this.properties == null) {
this.properties = new ConcurrentHashMap<>(8);
} else {
@@ -504,8 +501,7 @@ class AbstractExchange implements ExtendedExchange {
return context.getTypeConverter().convertTo(type, this, in);
}
- @Override
- public <T> T getInOrNull(Class<T> type) {
+ <T> T getInOrNull(Class<T> type) {
if (in == null) {
return null;
}
@@ -630,21 +626,11 @@ class AbstractExchange implements ExtendedExchange {
return fromEndpoint;
}
- @Override
- public void setFromEndpoint(Endpoint fromEndpoint) {
- this.fromEndpoint = fromEndpoint;
- }
-
@Override
public String getFromRouteId() {
return fromRouteId;
}
- @Override
- public void setFromRouteId(String fromRouteId) {
- this.fromRouteId = fromRouteId;
- }
-
@Override
public String getExchangeId() {
if (exchangeId == null) {
@@ -668,11 +654,6 @@ class AbstractExchange implements ExtendedExchange {
return transacted;
}
- @Override
- public void setTransacted(boolean transacted) {
- this.transacted = transacted;
- }
-
@Override
public boolean isRouteStop() {
return routeStop;
@@ -726,8 +707,7 @@ class AbstractExchange implements ExtendedExchange {
return unitOfWork;
}
- @Override
- public void setUnitOfWork(UnitOfWork unitOfWork) {
+ void setUnitOfWork(UnitOfWork unitOfWork) {
this.unitOfWork = unitOfWork;
if (unitOfWork != null && onCompletions != null) {
// now an unit of work has been assigned so add the on completions
@@ -742,8 +722,7 @@ class AbstractExchange implements ExtendedExchange {
}
}
- @Override
- public void addOnCompletion(Synchronization onCompletion) {
+ void addOnCompletion(Synchronization onCompletion) {
if (unitOfWork == null) {
// unit of work not yet registered so we store the on completion temporary
// until the unit of work is assigned to this exchange by the unit of work
@@ -756,8 +735,7 @@ class AbstractExchange implements ExtendedExchange {
}
}
- @Override
- public boolean containsOnCompletion(Synchronization onCompletion) {
+ boolean containsOnCompletion(Synchronization onCompletion) {
if (unitOfWork != null) {
// if there is an unit of work then the completions is moved there
return unitOfWork.containsSynchronization(onCompletion);
@@ -767,8 +745,7 @@ class AbstractExchange implements ExtendedExchange {
}
}
- @Override
- public void handoverCompletions(Exchange target) {
+ void handoverCompletions(Exchange target) {
if (onCompletions != null) {
for (Synchronization onCompletion : onCompletions) {
target.getExchangeExtension().addOnCompletion(onCompletion);
@@ -782,8 +759,7 @@ class AbstractExchange implements ExtendedExchange {
}
}
- @Override
- public List<Synchronization> handoverCompletions() {
+ List<Synchronization> handoverCompletions() {
List<Synchronization> answer = null;
if (onCompletions != null) {
answer = new ArrayList<>(onCompletions);
@@ -793,103 +769,16 @@ class AbstractExchange implements ExtendedExchange {
return answer;
}
- @Override
- public String getHistoryNodeId() {
- return historyNodeId;
- }
-
- @Override
- public void setHistoryNodeId(String historyNodeId) {
- this.historyNodeId = historyNodeId;
- }
-
- @Override
- public String getHistoryNodeLabel() {
- return historyNodeLabel;
- }
-
- @Override
- public void setHistoryNodeLabel(String historyNodeLabel) {
- this.historyNodeLabel = historyNodeLabel;
- }
-
- @Override
- public String getHistoryNodeSource() {
- return historyNodeSource;
- }
-
- @Override
- public void setHistoryNodeSource(String historyNodeSource) {
- this.historyNodeSource = historyNodeSource;
- }
-
- @Override
- public boolean isNotifyEvent() {
- return notifyEvent;
- }
-
- @Override
- public void setNotifyEvent(boolean notifyEvent) {
- this.notifyEvent = notifyEvent;
- }
-
- @Override
- public boolean isInterrupted() {
- return interrupted;
- }
-
- @Override
- public void setInterrupted(boolean interrupted) {
+ void setInterrupted(boolean interrupted) {
if (interruptable) {
this.interrupted = interrupted;
}
}
- @Override
- public void setInterruptable(boolean interruptable) {
- this.interruptable = interruptable;
- }
-
- @Override
- public boolean isRedeliveryExhausted() {
- return redeliveryExhausted;
- }
-
- @Override
- public void setRedeliveryExhausted(boolean redeliveryExhausted) {
- this.redeliveryExhausted = redeliveryExhausted;
- }
-
- @Override
- public Boolean getErrorHandlerHandled() {
- return errorHandlerHandled;
- }
-
- @Override
- public boolean isErrorHandlerHandledSet() {
+ boolean isErrorHandlerHandledSet() {
return errorHandlerHandled != null;
}
- @Override
- public boolean isErrorHandlerHandled() {
- return errorHandlerHandled;
- }
-
- @Override
- public void setErrorHandlerHandled(Boolean errorHandlerHandled) {
- this.errorHandlerHandled = errorHandlerHandled;
- }
-
- @Override
- public boolean isStreamCacheDisabled() {
- return streamCacheDisabled;
- }
-
- @Override
- public void setStreamCacheDisabled(boolean streamCacheDisabled) {
- this.streamCacheDisabled = streamCacheDisabled;
- }
-
/**
* Configures the message after it has been set on the exchange
*/
@@ -901,8 +790,7 @@ class AbstractExchange implements ExtendedExchange {
}
}
- @Override
- public void copyInternalProperties(Exchange target) {
+ void copyInternalProperties(Exchange target) {
AbstractExchange ae = (AbstractExchange) target;
for (int i = 0; i < internalProperties.length; i++) {
Object value = internalProperties[i];
@@ -912,8 +800,7 @@ class AbstractExchange implements ExtendedExchange {
}
}
- @Override
- public Map<String, Object> getInternalProperties() {
+ Map<String, Object> getInternalProperties() {
Map<String, Object> map = new HashMap<>();
for (ExchangePropertyKey key : ExchangePropertyKey.values()) {
Object value = internalProperties[key.ordinal()];
@@ -924,12 +811,10 @@ class AbstractExchange implements ExtendedExchange {
return map;
}
- @Override
public AsyncCallback getDefaultConsumerCallback() {
return defaultConsumerCallback;
}
- @Override
public void setDefaultConsumerCallback(AsyncCallback defaultConsumerCallback) {
this.defaultConsumerCallback = defaultConsumerCallback;
}
@@ -948,8 +833,7 @@ class AbstractExchange implements ExtendedExchange {
}
}
- @Override
- public void setSafeCopyProperty(String key, SafeCopyProperty value) {
+ void setSafeCopyProperty(String key, SafeCopyProperty value) {
if (value != null) {
// avoid the NullPointException
if (safeCopyProperties == null) {
@@ -964,8 +848,7 @@ class AbstractExchange implements ExtendedExchange {
}
@SuppressWarnings("unchecked")
- @Override
- public <T> T getSafeCopyProperty(String key, Class<T> type) {
+ <T> T getSafeCopyProperty(String key, Class<T> type) {
if (!hasSafeCopyProperties()) {
return null;
}
@@ -982,6 +865,4 @@ class AbstractExchange implements ExtendedExchange {
public ExtendedExchangeExtension getExchangeExtension() {
return privateExtension;
}
-
-
}