This is an automated email from the ASF dual-hosted git repository.
pcongiusti 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 9594e13568ee fix(components): core processor trasformer stream closure
9594e13568ee is described below
commit 9594e13568ee97527db68c613826c2c6c2ef4d14
Author: Pasquale Congiusti <[email protected]>
AuthorDate: Wed Dec 3 09:35:07 2025 +0100
fix(components): core processor trasformer stream closure
Beside that, fixing a few minor compilation warnings.
---
.../java/org/apache/camel/processor/BaseDelegateProcessorSupport.java | 3 +--
.../src/main/java/org/apache/camel/processor/ContractAdvice.java | 4 +++-
.../org/apache/camel/processor/InterceptSendToEndpointProcessor.java | 1 -
.../src/main/java/org/apache/camel/processor/MulticastProcessor.java | 1 -
.../main/java/org/apache/camel/processor/OnCompletionProcessor.java | 4 ++--
.../src/main/java/org/apache/camel/processor/Splitter.java | 4 +---
.../src/main/java/org/apache/camel/processor/WireTapProcessor.java | 2 +-
.../src/main/java/org/apache/camel/processor/WrapProcessor.java | 3 +--
.../java/org/apache/camel/processor/aggregate/AggregateProcessor.java | 3 +--
.../java/org/apache/camel/processor/errorhandler/NoErrorHandler.java | 2 +-
.../apache/camel/processor/errorhandler/RedeliveryErrorHandler.java | 4 ++--
.../camel/processor/transformer/AnnotationTransformerLoader.java | 3 +--
12 files changed, 14 insertions(+), 20 deletions(-)
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/BaseDelegateProcessorSupport.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/BaseDelegateProcessorSupport.java
index 60a3da12074a..90fa29ff7580 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/BaseDelegateProcessorSupport.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/BaseDelegateProcessorSupport.java
@@ -16,14 +16,13 @@
*/
package org.apache.camel.processor;
-import org.apache.camel.DisabledAware;
import org.apache.camel.Processor;
import org.apache.camel.support.processor.DelegateAsyncProcessor;
/**
* Base class for EIP implementations as {@link org.apache.camel.Processor}.
*/
-public abstract class BaseDelegateProcessorSupport extends
DelegateAsyncProcessor implements DisabledAware {
+public abstract class BaseDelegateProcessorSupport extends
DelegateAsyncProcessor {
public BaseDelegateProcessorSupport(Processor processor) {
super(processor);
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/ContractAdvice.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/ContractAdvice.java
index c6abf5db1768..4fae42ff4e6a 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/ContractAdvice.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/ContractAdvice.java
@@ -153,7 +153,9 @@ public class ContractAdvice implements
CamelInternalProcessorAdvice<Object> {
if (transformer != null) {
transformer.transform(message, DataType.ANY, type);
} else {
- new TypeConverterTransformer(type).transform(message,
DataType.ANY, type);
+ try (TypeConverterTransformer typeTrasformer = new
TypeConverterTransformer(type)) {
+ typeTrasformer.transform(message, DataType.ANY, type);
+ }
}
}
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/InterceptSendToEndpointProcessor.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/InterceptSendToEndpointProcessor.java
index ee91f12a9fce..1cb59a713bf4 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/InterceptSendToEndpointProcessor.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/InterceptSendToEndpointProcessor.java
@@ -24,7 +24,6 @@ import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePropertyKey;
import org.apache.camel.Predicate;
-import org.apache.camel.Processor;
import org.apache.camel.spi.InterceptSendToEndpoint;
import org.apache.camel.support.AsyncProcessorConverterHelper;
import org.apache.camel.support.DefaultAsyncProducer;
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/MulticastProcessor.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/MulticastProcessor.java
index e5199b923638..089173065581 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/MulticastProcessor.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/MulticastProcessor.java
@@ -1054,7 +1054,6 @@ public class MulticastProcessor extends
BaseProcessorSupport
return new DefaultProcessorExchangePair(index, processor, prepared,
exchange);
}
- @SuppressWarnings("unchecked")
protected Processor wrapInErrorHandler(Route route, Exchange exchange,
Processor processor) {
Processor answer;
Processor key = processor;
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
index bc5ba70b43b7..f544f240bcdb 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
@@ -248,7 +248,7 @@ public class OnCompletionProcessor extends
BaseProcessorSupport implements Trace
return answer;
}
- private final class OnCompletionSynchronizationAfterConsumer extends
SynchronizationAdapter implements Ordered {
+ private final class OnCompletionSynchronizationAfterConsumer extends
SynchronizationAdapter {
private final boolean routeScoped;
private final String routeId;
@@ -403,7 +403,7 @@ public class OnCompletionProcessor extends
BaseProcessorSupport implements Trace
}
}
- private final class OnCompletionSynchronizationBeforeConsumer extends
SynchronizationAdapter implements Ordered {
+ private final class OnCompletionSynchronizationBeforeConsumer extends
SynchronizationAdapter {
private final boolean routeScoped;
private final String routeId;
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/Splitter.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/Splitter.java
index 04bec6aed8a0..4620ecf945f4 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/Splitter.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/Splitter.java
@@ -29,7 +29,6 @@ import java.util.concurrent.ExecutorService;
import org.apache.camel.AggregationStrategy;
import org.apache.camel.AsyncCallback;
-import org.apache.camel.AsyncProcessor;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePropertyKey;
@@ -38,7 +37,6 @@ import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.Route;
import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.Traceable;
import org.apache.camel.processor.aggregate.ShareUnitOfWorkAggregationStrategy;
import org.apache.camel.processor.aggregate.UseOriginalAggregationStrategy;
import org.apache.camel.support.ExchangeHelper;
@@ -52,7 +50,7 @@ import static org.apache.camel.util.ObjectHelper.notNull;
* Implements a dynamic <a
href="http://camel.apache.org/splitter.html";>Splitter</a> pattern where an
expression is
* evaluated to iterate through each of the parts of a message and then each
part is then send to some endpoint.
*/
-public class Splitter extends MulticastProcessor implements AsyncProcessor,
Traceable {
+public class Splitter extends MulticastProcessor {
private static final String IGNORE_DELIMITER_MARKER = "false";
private static final String SINGLE_DELIMITER_MARKER = "single";
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/WireTapProcessor.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/WireTapProcessor.java
index 7287b226eea3..a1a911228274 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/WireTapProcessor.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/WireTapProcessor.java
@@ -84,7 +84,7 @@ public class WireTapProcessor extends BaseProcessorSupport
this.dynamicUri = dynamicUri;
}
- private final class WireTapTask implements PooledExchangeTask, Runnable {
+ private final class WireTapTask implements PooledExchangeTask {
private Exchange exchange;
private final AsyncCallback callback = new AsyncCallback() {
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/WrapProcessor.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/WrapProcessor.java
index 7042fed99d98..703eb8664be7 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/WrapProcessor.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/WrapProcessor.java
@@ -18,7 +18,6 @@ package org.apache.camel.processor;
import java.util.List;
-import org.apache.camel.DisabledAware;
import org.apache.camel.Processor;
import org.apache.camel.spi.WrapAwareProcessor;
import org.apache.camel.support.processor.DelegateAsyncProcessor;
@@ -27,7 +26,7 @@ import org.apache.camel.support.service.ServiceHelper;
/**
* A processor which ensures wrapping processors is having lifecycle handled.
*/
-public class WrapProcessor extends DelegateAsyncProcessor implements
WrapAwareProcessor, DisabledAware {
+public class WrapProcessor extends DelegateAsyncProcessor implements
WrapAwareProcessor {
private final Processor wrapped;
private boolean disabled;
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
index 8ff53e0a4188..0c77970cd9f3 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
@@ -59,7 +59,6 @@ import org.apache.camel.spi.ReactiveExecutor;
import org.apache.camel.spi.RecoverableAggregationRepository;
import org.apache.camel.spi.RouteIdAware;
import org.apache.camel.spi.ShutdownAware;
-import org.apache.camel.spi.ShutdownPrepared;
import org.apache.camel.spi.Synchronization;
import org.apache.camel.support.DefaultTimeoutMap;
import org.apache.camel.support.ExchangeHelper;
@@ -85,7 +84,7 @@ import org.slf4j.LoggerFactory;
* message.
*/
public class AggregateProcessor extends BaseProcessorSupport
- implements Navigate<Processor>, Traceable, ShutdownPrepared,
ShutdownAware, IdAware, RouteIdAware {
+ implements Navigate<Processor>, Traceable, ShutdownAware, IdAware,
RouteIdAware {
public static final String AGGREGATE_TIMEOUT_CHECKER =
"AggregateTimeoutChecker";
public static final String AGGREGATE_OPTIMISTIC_LOCKING_EXECUTOR =
"AggregateOptimisticLockingExecutor";
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/errorhandler/NoErrorHandler.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/errorhandler/NoErrorHandler.java
index 59d00a72fd8b..318615028678 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/errorhandler/NoErrorHandler.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/errorhandler/NoErrorHandler.java
@@ -28,7 +28,7 @@ import org.apache.camel.support.AsyncProcessorConverterHelper;
import org.apache.camel.support.AsyncProcessorHelper;
import org.apache.camel.support.service.ServiceHelper;
-public class NoErrorHandler extends ErrorHandlerSupport implements
AsyncProcessor, ErrorHandler {
+public class NoErrorHandler extends ErrorHandlerSupport implements
AsyncProcessor {
private final AsyncProcessor output;
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryErrorHandler.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryErrorHandler.java
index 6695e2ab1a8d..6c7045e0a129 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryErrorHandler.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryErrorHandler.java
@@ -361,7 +361,7 @@ public abstract class RedeliveryErrorHandler extends
ErrorHandlerSupport
/**
* Simple task to perform calling the processor with no redelivery support
*/
- protected class SimpleTask implements PooledExchangeTask, Runnable,
AsyncCallback {
+ protected class SimpleTask implements PooledExchangeTask, AsyncCallback {
private Exchange exchange;
private AsyncCallback callback;
private boolean first;
@@ -639,7 +639,7 @@ public abstract class RedeliveryErrorHandler extends
ErrorHandlerSupport
/**
* Task to perform calling the processor and handling redelivery if it
fails (more advanced than ProcessTask)
*/
- protected class RedeliveryTask implements PooledExchangeTask, Runnable {
+ protected class RedeliveryTask implements PooledExchangeTask {
// state
private Exchange original;
private Exchange exchange;
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/transformer/AnnotationTransformerLoader.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/transformer/AnnotationTransformerLoader.java
index b668c370d3db..e1bda235428e 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/transformer/AnnotationTransformerLoader.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/transformer/AnnotationTransformerLoader.java
@@ -27,7 +27,6 @@ import java.util.HashSet;
import java.util.Set;
import org.apache.camel.CamelContext;
-import org.apache.camel.CamelContextAware;
import org.apache.camel.Message;
import org.apache.camel.TypeConverterLoaderException;
import org.apache.camel.spi.DataType;
@@ -47,7 +46,7 @@ import org.slf4j.LoggerFactory;
* Transformer loader scans packages for {@link
org.apache.camel.spi.Transformer} classes annotated with
* {@link DataType} annotation.
*/
-public class AnnotationTransformerLoader extends Transformer implements
TransformerLoader, CamelContextAware {
+public class AnnotationTransformerLoader extends Transformer implements
TransformerLoader {
public static final String META_INF_SERVICES =
"META-INF/services/org/apache/camel/Transformer";
