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 13:48:34 UTC

[camel] branch main updated: 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


The following commit(s) were added to refs/heads/main by this push:
     new 3907f59  Removed deprecated constant and mark more as deprecated
3907f59 is described below

commit 3907f590ad10f8c42e96eb58c0c15ef516b3554d
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Jan 24 14:44:21 2022 +0100

    Removed deprecated constant and mark more as deprecated
---
 .../org/apache/camel/component/file/remote/RemoteFileConsumer.java  | 5 -----
 .../java/org/apache/camel/component/undertow/ExchangeHeaders.java   | 6 ------
 2 files changed, 11 deletions(-)

diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java
index a34dbcf..0d5e27d 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java
@@ -118,11 +118,6 @@ public abstract class RemoteFileConsumer<T> extends GenericFileConsumer<T> {
 
     @Override
     protected boolean processExchange(Exchange exchange) {
-        // mark the exchange to be processed synchronously as the ftp client is
-        // not thread safe
-        // and we must execute the callbacks in the same thread as this consumer
-        exchange.setProperty(Exchange.UNIT_OF_WORK_PROCESS_SYNC, Boolean.TRUE);
-
         // defer disconnect til the UoW is complete - but only the last exchange
         // from the batch should do that
         boolean isLast = exchange.getProperty(ExchangePropertyKey.BATCH_COMPLETE, true, Boolean.class);
diff --git a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/ExchangeHeaders.java b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/ExchangeHeaders.java
index 039aeec..59e50bf 100644
--- a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/ExchangeHeaders.java
+++ b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/ExchangeHeaders.java
@@ -158,12 +158,6 @@ public final class ExchangeHeaders {
 
     public static final HttpString UNIT_OF_WORK_EXHAUSTED = new HttpString("CamelUnitOfWorkExhausted");
 
-    /**
-     * @deprecated UNIT_OF_WORK_PROCESS_SYNC is not in use and will be removed in future Camel release
-     */
-    @Deprecated
-    public static final HttpString UNIT_OF_WORK_PROCESS_SYNC = new HttpString("CamelUnitOfWorkProcessSync");
-
     public static final HttpString XSLT_FILE_NAME = new HttpString("CamelXsltFileName");
     public static final HttpString XSLT_ERROR = new HttpString("CamelXsltError");
     public static final HttpString XSLT_FATAL_ERROR = new HttpString("CamelXsltFatalError");