You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2022/01/24 12:50:16 UTC
[camel] 02/02: Removed deprecated constant and mark more as deprecated
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
commit 66cb3716425366059946257a371760433f588cbf
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Jan 24 13:49:30 2022 +0100
Removed deprecated constant and mark more as deprecated
---
.../java/org/apache/camel/ExchangeConstantProvider.java | 3 +--
core/camel-api/src/main/java/org/apache/camel/Exchange.java | 10 ++++------
.../apache/camel/impl/engine/SharedCamelInternalProcessor.java | 4 +---
3 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/core/camel-api/src/generated/java/org/apache/camel/ExchangeConstantProvider.java b/core/camel-api/src/generated/java/org/apache/camel/ExchangeConstantProvider.java
index fed0d14..a9e6e6f 100644
--- a/core/camel-api/src/generated/java/org/apache/camel/ExchangeConstantProvider.java
+++ b/core/camel-api/src/generated/java/org/apache/camel/ExchangeConstantProvider.java
@@ -11,7 +11,7 @@ public class ExchangeConstantProvider {
private static final Map<String, String> MAP;
static {
- Map<String, String> map = new HashMap<>(152);
+ Map<String, String> map = new HashMap<>(151);
map.put("ACCEPT_CONTENT_TYPE", "CamelAcceptContentType");
map.put("AGGREGATED_COLLECTION_GUARD", "CamelAggregatedCollectionGuard");
map.put("AGGREGATED_COMPLETED_BY", "CamelAggregatedCompletedBy");
@@ -159,7 +159,6 @@ public class ExchangeConstantProvider {
map.put("TRANSFER_ENCODING", "Transfer-Encoding");
map.put("TRY_ROUTE_BLOCK", "TryRouteBlock");
map.put("UNIT_OF_WORK_EXHAUSTED", "CamelUnitOfWorkExhausted");
- map.put("UNIT_OF_WORK_PROCESS_SYNC", "CamelUnitOfWorkProcessSync");
map.put("XSLT_ERROR", "CamelXsltError");
map.put("XSLT_FATAL_ERROR", "CamelXsltFatalError");
map.put("XSLT_FILE_NAME", "CamelXsltFileName");
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 b7b7a1f..7cce1f2 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
@@ -219,9 +219,11 @@ public interface Exchange {
String REUSE_SCRIPT_ENGINE = "CamelReuseScripteEngine";
String COMPILE_SCRIPT = "CamelCompileScript";
+ @Deprecated
String SAXPARSER_FACTORY = "CamelSAXParserFactory";
String SCHEDULER_POLLED_MESSAGES = "CamelSchedulerPolledMessages";
+ @Deprecated
String SOAP_ACTION = "CamelSoapAction";
String SKIP_GZIP_ENCODING = "CamelSkipGzipEncoding";
String SKIP_WWW_FORM_URLENCODED = "CamelSkipWwwFormUrlEncoding";
@@ -242,19 +244,15 @@ public interface Exchange {
String TRACE_EVENT_NODE_ID = "CamelTraceEventNodeId";
String TRACE_EVENT_TIMESTAMP = "CamelTraceEventTimestamp";
String TRACE_EVENT_EXCHANGE = "CamelTraceEventExchange";
+ @Deprecated
String TRACING_HEADER_FORMAT = "CamelTracingHeaderFormat";
+ @Deprecated
String TRACING_OUTPUT_FORMAT = "CamelTracingOutputFormat";
String TRY_ROUTE_BLOCK = "TryRouteBlock";
String TRANSFER_ENCODING = "Transfer-Encoding";
String UNIT_OF_WORK_EXHAUSTED = "CamelUnitOfWorkExhausted";
- /**
- * @deprecated UNIT_OF_WORK_PROCESS_SYNC is not in use and will be removed in future Camel release
- */
- @Deprecated
- String UNIT_OF_WORK_PROCESS_SYNC = "CamelUnitOfWorkProcessSync";
-
String XSLT_FILE_NAME = "CamelXsltFileName";
String XSLT_ERROR = "CamelXsltError";
String XSLT_FATAL_ERROR = "CamelXsltFatalError";
diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SharedCamelInternalProcessor.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SharedCamelInternalProcessor.java
index 9bf7679..eb23a8c 100644
--- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SharedCamelInternalProcessor.java
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SharedCamelInternalProcessor.java
@@ -171,9 +171,7 @@ public class SharedCamelInternalProcessor implements SharedInternalProcessor {
// create internal callback which will execute the advices in reverse order when done
AsyncCallback callback = new InternalCallback(states, exchange, originalCallback, resultProcessor);
- // UNIT_OF_WORK_PROCESS_SYNC is @deprecated and we should remove it from Camel 3.0
- Object synchronous = exchange.removeProperty(Exchange.UNIT_OF_WORK_PROCESS_SYNC);
- if (exchange.isTransacted() || synchronous != null) {
+ if (exchange.isTransacted()) {
// must be synchronized for transacted exchanges
if (LOG.isTraceEnabled()) {
if (exchange.isTransacted()) {