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 2020/01/07 14:52:19 UTC
[camel] branch master updated (5b76f59 -> a0d45f8)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 5b76f59 Upgrade Undertow to version 2.0.29.Final
new 9bfd0ff CAMEL-14356: camel-core - toString of processors should just their id.
new a0d45f8 Remove not used classes
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/camel/processor/CatchProcessor.java | 2 +-
.../apache/camel/processor/ChoiceProcessor.java | 18 +--
.../camel/processor/ClaimCheckProcessor.java | 2 +-
.../camel/processor/ConvertBodyProcessor.java | 2 +-
.../java/org/apache/camel/processor/Delayer.java | 2 +-
.../java/org/apache/camel/processor/Enricher.java | 2 +-
.../camel/processor/ExchangePatternProcessor.java | 2 +-
.../apache/camel/processor/FilterProcessor.java | 2 +-
.../apache/camel/processor/FinallyProcessor.java | 2 +-
.../InterceptorToAsyncProcessorBridge.java | 111 -----------------
.../org/apache/camel/processor/LogProcessor.java | 2 +-
.../org/apache/camel/processor/LoopProcessor.java | 6 +-
.../camel/processor/MethodCallProcessor.java | 132 ---------------------
.../apache/camel/processor/MulticastProcessor.java | 2 +-
.../camel/processor/OnCompletionProcessor.java | 2 +-
.../java/org/apache/camel/processor/Pipeline.java | 2 +-
.../org/apache/camel/processor/PollEnricher.java | 2 +-
.../org/apache/camel/processor/RecipientList.java | 2 +-
.../camel/processor/RecipientListProcessor.java | 5 -
.../camel/processor/RemoveHeaderProcessor.java | 2 +-
.../camel/processor/RemoveHeadersProcessor.java | 2 +-
.../camel/processor/RemovePropertiesProcessor.java | 2 +-
.../camel/processor/RemovePropertyProcessor.java | 2 +-
.../org/apache/camel/processor/Resequencer.java | 2 +-
.../apache/camel/processor/RollbackProcessor.java | 6 +-
.../org/apache/camel/processor/RoutingSlip.java | 2 +-
.../apache/camel/processor/SamplingThrottler.java | 6 +-
.../apache/camel/processor/ScriptProcessor.java | 2 +-
.../camel/processor/SendDynamicProcessor.java | 2 +-
.../org/apache/camel/processor/SendProcessor.java | 2 +-
.../apache/camel/processor/SetBodyProcessor.java | 2 +-
.../apache/camel/processor/SetHeaderProcessor.java | 2 +-
.../camel/processor/SetPropertyProcessor.java | 2 +-
.../org/apache/camel/processor/SortProcessor.java | 2 +-
.../java/org/apache/camel/processor/Splitter.java | 5 -
.../org/apache/camel/processor/StepProcessor.java | 5 -
.../org/apache/camel/processor/StopProcessor.java | 2 +-
.../apache/camel/processor/StreamResequencer.java | 2 +-
.../apache/camel/processor/ThreadsProcessor.java | 2 +-
.../java/org/apache/camel/processor/Throttler.java | 2 +-
.../camel/processor/ThrowExceptionProcessor.java | 2 +-
.../apache/camel/processor/TransformProcessor.java | 2 +-
.../org/apache/camel/processor/TryProcessor.java | 4 +-
.../apache/camel/processor/WireTapProcessor.java | 2 +-
.../org/apache/camel/processor/WrapProcessor.java | 2 +-
.../processor/aggregate/AggregateProcessor.java | 2 +-
.../processor/idempotent/IdempotentConsumer.java | 5 +-
.../apache/camel/processor/saga/SagaProcessor.java | 33 +++++-
.../management/ManagedValidatorRegistryTest.java | 33 +-----
.../camel/support/processor/CamelLogProcessor.java | 2 +-
50 files changed, 80 insertions(+), 363 deletions(-)
delete mode 100644 core/camel-base/src/main/java/org/apache/camel/processor/InterceptorToAsyncProcessorBridge.java
delete mode 100644 core/camel-base/src/main/java/org/apache/camel/processor/MethodCallProcessor.java
[camel] 02/02: Remove not used classes
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a0d45f8c844cd3a5288c08e32a9e992253986519
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Jan 7 15:42:53 2020 +0100
Remove not used classes
---
.../InterceptorToAsyncProcessorBridge.java | 114 -----------------
.../camel/processor/MethodCallProcessor.java | 135 ---------------------
2 files changed, 249 deletions(-)
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/InterceptorToAsyncProcessorBridge.java b/core/camel-base/src/main/java/org/apache/camel/processor/InterceptorToAsyncProcessorBridge.java
deleted file mode 100644
index 3720251..0000000
--- a/core/camel-base/src/main/java/org/apache/camel/processor/InterceptorToAsyncProcessorBridge.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.processor;
-
-import java.util.concurrent.CompletableFuture;
-
-import org.apache.camel.AsyncCallback;
-import org.apache.camel.AsyncProcessor;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.support.AsyncCallbackToCompletableFutureAdapter;
-import org.apache.camel.support.AsyncProcessorConverterHelper;
-import org.apache.camel.support.service.ServiceHelper;
-import org.apache.camel.support.service.ServiceSupport;
-
-// TODO: delete me
-
-/**
- * A bridge to have regular interceptors implemented as {@link org.apache.camel.Processor}
- * work with the asynchronous routing engine without causing side effects.
- */
-@Deprecated
-public class InterceptorToAsyncProcessorBridge extends ServiceSupport implements AsyncProcessor {
-
- private final AsyncProcessor interceptor;
- private volatile AsyncProcessor target;
- private volatile ThreadLocal<AsyncCallback> callback = new ThreadLocal<>();
- private volatile ThreadLocal<Boolean> interceptorDone = new ThreadLocal<>();
-
- /**
- * Constructs the bridge
- *
- * @param interceptor the interceptor to bridge
- */
- public InterceptorToAsyncProcessorBridge(Processor interceptor) {
- this.interceptor = AsyncProcessorConverterHelper.convert(interceptor);
- this.target = AsyncProcessorConverterHelper.convert(target);
- }
-
- /**
- * Process invoked by the interceptor
- * @param exchange the message exchange
- * @throws Exception
- */
- @Override
- public void process(Exchange exchange) throws Exception {
- // invoke when interceptor wants to invoke
- boolean done = interceptor.process(exchange, callback.get());
- interceptorDone.set(done);
- }
-
- @Override
- public boolean process(Exchange exchange, AsyncCallback callback) {
- // remember the callback to be used by the interceptor
- this.callback.set(callback);
- try {
- // invoke the target
- boolean done = target.process(exchange, callback);
- if (interceptorDone.get() != null) {
- // return the result from the interceptor if it was invoked
- return interceptorDone.get();
- } else {
- // otherwise from the target
- return done;
- }
- } finally {
- // cleanup
- this.callback.remove();
- this.interceptorDone.remove();
- }
- }
-
- @Override
- public CompletableFuture<Exchange> processAsync(Exchange exchange) {
- AsyncCallbackToCompletableFutureAdapter<Exchange> callback = new AsyncCallbackToCompletableFutureAdapter<>(exchange);
- process(exchange, callback);
- return callback.getFuture();
- }
-
- public void setTarget(Processor target) {
- this.target = AsyncProcessorConverterHelper.convert(target);
- }
-
- @Override
- public String toString() {
- return "AsyncBridge[" + interceptor.toString() + "]";
- }
-
- @Override
- protected void doStart() throws Exception {
- ServiceHelper.startService(target, interceptor);
- }
-
- @Override
- protected void doStop() throws Exception {
- callback.remove();
- interceptorDone.remove();
- ServiceHelper.stopService(interceptor, target);
- }
-}
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/MethodCallProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/MethodCallProcessor.java
deleted file mode 100644
index 5c12413..0000000
--- a/core/camel-base/src/main/java/org/apache/camel/processor/MethodCallProcessor.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.processor;
-
-import org.apache.camel.AsyncCallback;
-import org.apache.camel.Exchange;
-import org.apache.camel.Expression;
-import org.apache.camel.Message;
-import org.apache.camel.Traceable;
-import org.apache.camel.spi.IdAware;
-import org.apache.camel.spi.RouteIdAware;
-import org.apache.camel.support.AsyncProcessorSupport;
-import org.apache.camel.support.DefaultMessage;
-import org.apache.camel.support.ExchangeHelper;
-import org.apache.camel.util.ObjectHelper;
-
-// TODO: delete me
-
-/**
- * A processor which are used when calling a method and setting the response as the message body
- */
-@Deprecated
-public class MethodCallProcessor extends AsyncProcessorSupport implements Traceable, IdAware, RouteIdAware {
- private String id;
- private String routeId;
- private final Expression expression;
-
- public MethodCallProcessor(Expression expression) {
- ObjectHelper.notNull(expression, "expression", this);
- this.expression = expression;
- }
-
- @Override
- public boolean process(Exchange exchange, AsyncCallback callback) {
- try {
- Object newBody = expression.evaluate(exchange, Object.class);
-
- if (exchange.getException() != null) {
- // the expression threw an exception so we should break-out
- callback.done(true);
- return true;
- }
-
- // if null/empty response its due to void / no-response, then dont change the body
- if (newBody != null) {
-
- Message old = exchange.getMessage();
-
- // create a new message container so we do not drag specialized message objects along
- // but that is only needed if the old message is a specialized message
- boolean copyNeeded = !(old.getClass().equals(DefaultMessage.class));
-
- if (copyNeeded) {
- Message msg = new DefaultMessage(exchange.getContext());
- msg.copyFromWithNewBody(old, newBody);
-
- // replace message on exchange (must set as OUT)
- ExchangeHelper.replaceMessage(exchange, msg, true);
- } else {
- // no copy needed so set replace value directly
- old.setBody(newBody);
-
- // but the message must be on OUT
- if (!exchange.hasOut()) {
- exchange.setOut(exchange.getIn());
- }
- }
- }
-
- } catch (Throwable e) {
- exchange.setException(e);
- }
-
- callback.done(true);
- return true;
- }
-
- @Override
- public String toString() {
- return "MethodCall(" + expression + ")";
- }
-
- @Override
- public String getTraceLabel() {
- return "methodCall[" + expression + "]";
- }
-
- @Override
- public String getId() {
- return id;
- }
-
- @Override
- public void setId(String id) {
- this.id = id;
- }
-
- @Override
- public String getRouteId() {
- return routeId;
- }
-
- @Override
- public void setRouteId(String routeId) {
- this.routeId = routeId;
- }
-
- public Expression getExpression() {
- return expression;
- }
-
- @Override
- protected void doStart() throws Exception {
- // noop
- }
-
- @Override
- protected void doStop() throws Exception {
- // noop
- }
-}
[camel] 01/02: CAMEL-14356: camel-core - toString of processors
should just their id.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 9bfd0ff25bed96a614bf51cccbeeb8c47d02ee38
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Jan 7 15:39:18 2020 +0100
CAMEL-14356: camel-core - toString of processors should just their id.
---
.../org/apache/camel/processor/CatchProcessor.java | 2 +-
.../apache/camel/processor/ChoiceProcessor.java | 18 +-----------
.../camel/processor/ClaimCheckProcessor.java | 2 +-
.../camel/processor/ConvertBodyProcessor.java | 2 +-
.../java/org/apache/camel/processor/Delayer.java | 2 +-
.../java/org/apache/camel/processor/Enricher.java | 2 +-
.../camel/processor/ExchangePatternProcessor.java | 2 +-
.../apache/camel/processor/FilterProcessor.java | 2 +-
.../apache/camel/processor/FinallyProcessor.java | 2 +-
.../InterceptorToAsyncProcessorBridge.java | 3 ++
.../org/apache/camel/processor/LogProcessor.java | 2 +-
.../org/apache/camel/processor/LoopProcessor.java | 6 +---
.../camel/processor/MethodCallProcessor.java | 3 ++
.../apache/camel/processor/MulticastProcessor.java | 2 +-
.../camel/processor/OnCompletionProcessor.java | 2 +-
.../java/org/apache/camel/processor/Pipeline.java | 2 +-
.../org/apache/camel/processor/PollEnricher.java | 2 +-
.../org/apache/camel/processor/RecipientList.java | 2 +-
.../camel/processor/RecipientListProcessor.java | 5 ----
.../camel/processor/RemoveHeaderProcessor.java | 2 +-
.../camel/processor/RemoveHeadersProcessor.java | 2 +-
.../camel/processor/RemovePropertiesProcessor.java | 2 +-
.../camel/processor/RemovePropertyProcessor.java | 2 +-
.../org/apache/camel/processor/Resequencer.java | 2 +-
.../apache/camel/processor/RollbackProcessor.java | 6 +---
.../org/apache/camel/processor/RoutingSlip.java | 2 +-
.../apache/camel/processor/SamplingThrottler.java | 6 +---
.../apache/camel/processor/ScriptProcessor.java | 2 +-
.../camel/processor/SendDynamicProcessor.java | 2 +-
.../org/apache/camel/processor/SendProcessor.java | 2 +-
.../apache/camel/processor/SetBodyProcessor.java | 2 +-
.../apache/camel/processor/SetHeaderProcessor.java | 2 +-
.../camel/processor/SetPropertyProcessor.java | 2 +-
.../org/apache/camel/processor/SortProcessor.java | 2 +-
.../java/org/apache/camel/processor/Splitter.java | 5 ----
.../org/apache/camel/processor/StepProcessor.java | 5 ----
.../org/apache/camel/processor/StopProcessor.java | 2 +-
.../apache/camel/processor/StreamResequencer.java | 2 +-
.../apache/camel/processor/ThreadsProcessor.java | 2 +-
.../java/org/apache/camel/processor/Throttler.java | 2 +-
.../camel/processor/ThrowExceptionProcessor.java | 2 +-
.../apache/camel/processor/TransformProcessor.java | 2 +-
.../org/apache/camel/processor/TryProcessor.java | 4 +--
.../apache/camel/processor/WireTapProcessor.java | 2 +-
.../org/apache/camel/processor/WrapProcessor.java | 2 +-
.../processor/aggregate/AggregateProcessor.java | 2 +-
.../processor/idempotent/IdempotentConsumer.java | 5 ++--
.../apache/camel/processor/saga/SagaProcessor.java | 33 +++++++++++++++++++++-
.../management/ManagedValidatorRegistryTest.java | 33 ++--------------------
.../camel/support/processor/CamelLogProcessor.java | 2 +-
50 files changed, 86 insertions(+), 120 deletions(-)
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/CatchProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/CatchProcessor.java
index ee6f814..d8daf3a 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/CatchProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/CatchProcessor.java
@@ -48,7 +48,7 @@ public class CatchProcessor extends DelegateAsyncProcessor implements Traceable,
@Override
public String toString() {
- return "Catch[" + exceptions + " -> " + getProcessor() + "]";
+ return id;
}
@Override
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/ChoiceProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/ChoiceProcessor.java
index 96f29ba..a5e4f14 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/ChoiceProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/ChoiceProcessor.java
@@ -118,23 +118,7 @@ public class ChoiceProcessor extends AsyncProcessorSupport implements Navigate<P
@Override
public String toString() {
- StringBuilder builder = new StringBuilder("choice{");
- boolean first = true;
- for (Processor processor : filters) {
- if (first) {
- first = false;
- } else {
- builder.append(", ");
- }
- builder.append("when ");
- builder.append(processor);
- }
- if (otherwise != null) {
- builder.append(", otherwise: ");
- builder.append(otherwise);
- }
- builder.append("}");
- return builder.toString();
+ return id;
}
@Override
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/ClaimCheckProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/ClaimCheckProcessor.java
index 016d463..772e74e 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/ClaimCheckProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/ClaimCheckProcessor.java
@@ -206,7 +206,7 @@ public class ClaimCheckProcessor extends AsyncProcessorSupport implements IdAwar
@Override
public String toString() {
- return "ClaimCheck[" + operation + "]";
+ return id;
}
protected AggregationStrategy createAggregationStrategy() {
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/ConvertBodyProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/ConvertBodyProcessor.java
index dcb87a8..d1b0e7b 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/ConvertBodyProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/ConvertBodyProcessor.java
@@ -56,7 +56,7 @@ public class ConvertBodyProcessor extends ServiceSupport implements AsyncProcess
@Override
public String toString() {
- return "convertBodyTo[" + type.getCanonicalName() + "]";
+ return id;
}
@Override
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/Delayer.java b/core/camel-base/src/main/java/org/apache/camel/processor/Delayer.java
index d5b3eb5..00db6b4 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/Delayer.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/Delayer.java
@@ -47,7 +47,7 @@ public class Delayer extends DelayProcessorSupport implements Traceable, IdAware
@Override
public String toString() {
- return "Delayer[" + delay + " to: " + getProcessor() + "]";
+ return id;
}
@Override
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/Enricher.java b/core/camel-base/src/main/java/org/apache/camel/processor/Enricher.java
index 21dab2f..efd8b67 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/Enricher.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/Enricher.java
@@ -343,7 +343,7 @@ public class Enricher extends AsyncProcessorSupport implements IdAware, RouteIdA
@Override
public String toString() {
- return "Enrich[" + expression + "]";
+ return id;
}
@Override
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/ExchangePatternProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/ExchangePatternProcessor.java
index 516bcc7..167bf49 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/ExchangePatternProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/ExchangePatternProcessor.java
@@ -75,7 +75,7 @@ public class ExchangePatternProcessor extends AsyncProcessorSupport implements I
@Override
public String toString() {
- return "SetExchangePattern[" + exchangePattern + "]";
+ return id;
}
@Override
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/FilterProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/FilterProcessor.java
index a07576a..c5d50fe 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/FilterProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/FilterProcessor.java
@@ -77,7 +77,7 @@ public class FilterProcessor extends DelegateAsyncProcessor implements Traceable
@Override
public String toString() {
- return "Filter[if: " + predicate + " do: " + getProcessor() + "]";
+ return id;
}
@Override
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/FinallyProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/FinallyProcessor.java
index d43c373..4231151 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/FinallyProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/FinallyProcessor.java
@@ -57,7 +57,7 @@ public class FinallyProcessor extends DelegateAsyncProcessor implements Traceabl
@Override
public String toString() {
- return "Finally{" + getProcessor() + "}";
+ return id;
}
@Override
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/InterceptorToAsyncProcessorBridge.java b/core/camel-base/src/main/java/org/apache/camel/processor/InterceptorToAsyncProcessorBridge.java
index 20f6474..3720251 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/InterceptorToAsyncProcessorBridge.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/InterceptorToAsyncProcessorBridge.java
@@ -27,10 +27,13 @@ import org.apache.camel.support.AsyncProcessorConverterHelper;
import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.support.service.ServiceSupport;
+// TODO: delete me
+
/**
* A bridge to have regular interceptors implemented as {@link org.apache.camel.Processor}
* work with the asynchronous routing engine without causing side effects.
*/
+@Deprecated
public class InterceptorToAsyncProcessorBridge extends ServiceSupport implements AsyncProcessor {
private final AsyncProcessor interceptor;
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/LogProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/LogProcessor.java
index 5d2203e..b443472 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/LogProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/LogProcessor.java
@@ -91,7 +91,7 @@ public class LogProcessor extends AsyncProcessorSupport implements Traceable, Id
@Override
public String toString() {
- return "Log(" + logger.getLog().getName() + ")[" + expression + "]";
+ return id;
}
@Override
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/LoopProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/LoopProcessor.java
index d368555..3989f52 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/LoopProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/LoopProcessor.java
@@ -194,10 +194,6 @@ public class LoopProcessor extends DelegateAsyncProcessor implements Traceable,
@Override
public String toString() {
- if (predicate != null) {
- return "Loop[while: " + predicate + " do: " + getProcessor() + "]";
- } else {
- return "Loop[for: " + expression + " times do: " + getProcessor() + "]";
- }
+ return id;
}
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/MethodCallProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/MethodCallProcessor.java
index 6a7e111..5c12413 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/MethodCallProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/MethodCallProcessor.java
@@ -28,9 +28,12 @@ import org.apache.camel.support.DefaultMessage;
import org.apache.camel.support.ExchangeHelper;
import org.apache.camel.util.ObjectHelper;
+// TODO: delete me
+
/**
* A processor which are used when calling a method and setting the response as the message body
*/
+@Deprecated
public class MethodCallProcessor extends AsyncProcessorSupport implements Traceable, IdAware, RouteIdAware {
private String id;
private String routeId;
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/MulticastProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/MulticastProcessor.java
index 7546dbc..3c00670 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/MulticastProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/MulticastProcessor.java
@@ -194,7 +194,7 @@ public class MulticastProcessor extends AsyncProcessorSupport implements Navigat
@Override
public String toString() {
- return "Multicast[" + getProcessors() + "]";
+ return id;
}
@Override
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
index 686e00c..64a5ead 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
@@ -358,7 +358,7 @@ public class OnCompletionProcessor extends AsyncProcessorSupport implements Trac
@Override
public String toString() {
- return "OnCompletionProcessor[" + processor + "]";
+ return id;
}
@Override
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/Pipeline.java b/core/camel-base/src/main/java/org/apache/camel/processor/Pipeline.java
index 6ad6f8f..2aa26f0 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/Pipeline.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/Pipeline.java
@@ -141,7 +141,7 @@ public class Pipeline extends AsyncProcessorSupport implements Navigate<Processo
@Override
public String toString() {
- return "Pipeline[" + getProcessors() + "]";
+ return id;
}
public List<Processor> getProcessors() {
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/PollEnricher.java b/core/camel-base/src/main/java/org/apache/camel/processor/PollEnricher.java
index f947a0b..c441146 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/PollEnricher.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/PollEnricher.java
@@ -358,7 +358,7 @@ public class PollEnricher extends AsyncProcessorSupport implements IdAware, Rout
@Override
public String toString() {
- return "PollEnrich[" + expression + "]";
+ return id;
}
@Override
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/RecipientList.java b/core/camel-base/src/main/java/org/apache/camel/processor/RecipientList.java
index 037b064..d8dc7ac 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/RecipientList.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/RecipientList.java
@@ -98,7 +98,7 @@ public class RecipientList extends AsyncProcessorSupport implements IdAware, Rou
@Override
public String toString() {
- return "RecipientList[" + (expression != null ? expression : "") + "]";
+ return id;
}
@Override
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/RecipientListProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/RecipientListProcessor.java
index 8e1d65b..7701ea9 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/RecipientListProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/RecipientListProcessor.java
@@ -282,11 +282,6 @@ public class RecipientListProcessor extends MulticastProcessor {
}
@Override
- public String toString() {
- return "RecipientList";
- }
-
- @Override
public String getTraceLabel() {
return "recipientList";
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/RemoveHeaderProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/RemoveHeaderProcessor.java
index 07e93dc..2ba0c14 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/RemoveHeaderProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/RemoveHeaderProcessor.java
@@ -49,7 +49,7 @@ public class RemoveHeaderProcessor extends AsyncProcessorSupport implements Trac
@Override
public String toString() {
- return "RemoveHeader(" + headerName + ")";
+ return id;
}
@Override
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/RemoveHeadersProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/RemoveHeadersProcessor.java
index 27e1249..7efad80 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/RemoveHeadersProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/RemoveHeadersProcessor.java
@@ -51,7 +51,7 @@ public class RemoveHeadersProcessor extends AsyncProcessorSupport implements Tra
@Override
public String toString() {
- return "RemoveHeaders(" + pattern + ")";
+ return id;
}
@Override
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/RemovePropertiesProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/RemovePropertiesProcessor.java
index f7b9016..042571a 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/RemovePropertiesProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/RemovePropertiesProcessor.java
@@ -51,7 +51,7 @@ public class RemovePropertiesProcessor extends AsyncProcessorSupport implements
@Override
public String toString() {
- return "RemoveProperties(" + pattern + ")";
+ return id;
}
@Override
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/RemovePropertyProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/RemovePropertyProcessor.java
index b7bf5f9..1f31f28 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/RemovePropertyProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/RemovePropertyProcessor.java
@@ -49,7 +49,7 @@ public class RemovePropertyProcessor extends AsyncProcessorSupport implements Tr
@Override
public String toString() {
- return "RemoveProperty(" + propertyName + ")";
+ return id;
}
@Override
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/Resequencer.java b/core/camel-base/src/main/java/org/apache/camel/processor/Resequencer.java
index f2598c5..a9b0e11 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/Resequencer.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/Resequencer.java
@@ -107,7 +107,7 @@ public class Resequencer extends AsyncProcessorSupport implements Navigate<Proce
@Override
public String toString() {
- return "Resequencer[to: " + getProcessor() + "]";
+ return id;
}
@Override
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/RollbackProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/RollbackProcessor.java
index 7ed8589..d6ed446 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/RollbackProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/RollbackProcessor.java
@@ -72,11 +72,7 @@ public class RollbackProcessor extends AsyncProcessorSupport implements Traceabl
@Override
public String toString() {
- if (message != null) {
- return "Rollback[" + message + "]";
- } else {
- return "Rollback";
- }
+ return id;
}
@Override
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/RoutingSlip.java b/core/camel-base/src/main/java/org/apache/camel/processor/RoutingSlip.java
index 975456d..8162624 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/RoutingSlip.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/RoutingSlip.java
@@ -162,7 +162,7 @@ public class RoutingSlip extends AsyncProcessorSupport implements Traceable, IdA
@Override
public String toString() {
- return "RoutingSlip[expression=" + expression + " uriDelimiter=" + uriDelimiter + "]";
+ return id;
}
@Override
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/SamplingThrottler.java b/core/camel-base/src/main/java/org/apache/camel/processor/SamplingThrottler.java
index 974cf4b..7ae1aed 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/SamplingThrottler.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/SamplingThrottler.java
@@ -72,11 +72,7 @@ public class SamplingThrottler extends AsyncProcessorSupport implements Traceabl
@Override
public String toString() {
- if (messageFrequency > 0) {
- return "SamplingThrottler[1 exchange per: " + messageFrequency + " messages received]";
- } else {
- return "SamplingThrottler[1 exchange per: " + samplePeriod + " " + units.toString().toLowerCase(Locale.ENGLISH) + "]";
- }
+ return id;
}
@Override
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/ScriptProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/ScriptProcessor.java
index 4d72dbc..c1756d3 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/ScriptProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/ScriptProcessor.java
@@ -52,7 +52,7 @@ public class ScriptProcessor extends AsyncProcessorSupport implements Traceable,
@Override
public String toString() {
- return "Script(" + expression + ")";
+ return id;
}
@Override
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/SendDynamicProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/SendDynamicProcessor.java
index 12234bd..5585117 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/SendDynamicProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/SendDynamicProcessor.java
@@ -64,7 +64,7 @@ public class SendDynamicProcessor extends AsyncProcessorSupport implements IdAwa
@Override
public String toString() {
- return "sendTo(" + getExpression() + ")";
+ return id;
}
@Override
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/SendProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/SendProcessor.java
index 1885347..1aaa98f 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/SendProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/SendProcessor.java
@@ -77,7 +77,7 @@ public class SendProcessor extends AsyncProcessorSupport implements Traceable, E
@Override
public String toString() {
- return "sendTo(" + destination + ")";
+ return id;
}
@Override
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/SetBodyProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/SetBodyProcessor.java
index d39f2ab..cab49bb 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/SetBodyProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/SetBodyProcessor.java
@@ -77,7 +77,7 @@ public class SetBodyProcessor extends AsyncProcessorSupport implements Traceable
@Override
public String toString() {
- return "SetBody(" + expression + ")";
+ return id;
}
@Override
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/SetHeaderProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/SetHeaderProcessor.java
index 1fe8188..72a026a 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/SetHeaderProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/SetHeaderProcessor.java
@@ -68,7 +68,7 @@ public class SetHeaderProcessor extends AsyncProcessorSupport implements Traceab
@Override
public String toString() {
- return "SetHeader(" + headerName + ", " + expression + ")";
+ return id;
}
@Override
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/SetPropertyProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/SetPropertyProcessor.java
index aaf29d4..970f125 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/SetPropertyProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/SetPropertyProcessor.java
@@ -64,7 +64,7 @@ public class SetPropertyProcessor extends AsyncProcessorSupport implements Trace
@Override
public String toString() {
- return "SetProperty(" + propertyName + ", " + expression + ")";
+ return id;
}
@Override
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/SortProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/SortProcessor.java
index 4bb4373..c460421 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/SortProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/SortProcessor.java
@@ -60,7 +60,7 @@ public class SortProcessor<T> extends AsyncProcessorSupport implements IdAware,
@Override
public String toString() {
- return "Sort[" + expression + "]";
+ return id;
}
@Override
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/Splitter.java b/core/camel-base/src/main/java/org/apache/camel/processor/Splitter.java
index 44cbf12..7250144 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/Splitter.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/Splitter.java
@@ -72,11 +72,6 @@ public class Splitter extends MulticastProcessor implements AsyncProcessor, Trac
}
@Override
- public String toString() {
- return "Splitter[on: " + expression + " to: " + getProcessors().iterator().next() + " aggregate: " + getAggregationStrategy() + "]";
- }
-
- @Override
public String getTraceLabel() {
return "split[" + expression + "]";
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/StepProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/StepProcessor.java
index 5199085..2d4c0f9 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/StepProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/StepProcessor.java
@@ -81,9 +81,4 @@ public class StepProcessor extends Pipeline {
return "step";
}
- @Override
- public String toString() {
- return "Step[" + stepId + "]";
- }
-
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/StopProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/StopProcessor.java
index aefd1ce..5c99fc8 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/StopProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/StopProcessor.java
@@ -41,7 +41,7 @@ public class StopProcessor extends AsyncProcessorSupport implements IdAware, Rou
@Override
public String toString() {
- return "Stop";
+ return id;
}
@Override
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/StreamResequencer.java b/core/camel-base/src/main/java/org/apache/camel/processor/StreamResequencer.java
index 93f52ab..c6e7a03 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/StreamResequencer.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/StreamResequencer.java
@@ -172,7 +172,7 @@ public class StreamResequencer extends AsyncProcessorSupport implements Sequence
@Override
public String toString() {
- return "StreamResequencer[to: " + processor + "]";
+ return id;
}
@Override
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/ThreadsProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/ThreadsProcessor.java
index af737a6..bb16743 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/ThreadsProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/ThreadsProcessor.java
@@ -153,7 +153,7 @@ public class ThreadsProcessor extends AsyncProcessorSupport implements IdAware,
@Override
public String toString() {
- return "Threads";
+ return id;
}
@Override
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/Throttler.java b/core/camel-base/src/main/java/org/apache/camel/processor/Throttler.java
index 4ebb520..50d7689 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/Throttler.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/Throttler.java
@@ -439,6 +439,6 @@ public class Throttler extends AsyncProcessorSupport implements Traceable, IdAwa
@Override
public String toString() {
- return "Throttler[requests: " + maxRequestsPerPeriodExpression + " per: " + timePeriodMillis + " (ms)]";
+ return id;
}
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/ThrowExceptionProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/ThrowExceptionProcessor.java
index 68ee7e5..276b1fa 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/ThrowExceptionProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/ThrowExceptionProcessor.java
@@ -130,7 +130,7 @@ public class ThrowExceptionProcessor extends AsyncProcessorSupport implements Tr
@Override
public String toString() {
- return "ThrowException";
+ return id;
}
@Override
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/TransformProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/TransformProcessor.java
index 19924d0..9791b1a 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/TransformProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/TransformProcessor.java
@@ -84,7 +84,7 @@ public class TransformProcessor extends AsyncProcessorSupport implements Traceab
@Override
public String toString() {
- return "Transform(" + expression + ")";
+ return id;
}
@Override
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/TryProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/TryProcessor.java
index 71408e6..7f3f8fd 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/TryProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/TryProcessor.java
@@ -52,9 +52,7 @@ public class TryProcessor extends AsyncProcessorSupport implements Navigate<Proc
@Override
public String toString() {
- String catchText = catchClauses == null || catchClauses.isEmpty() ? "" : " Catches {" + catchClauses + "}";
- String finallyText = (finallyProcessor == null) ? "" : " Finally {" + finallyProcessor + "}";
- return "Try {" + tryProcessor + "}" + catchText + finallyText;
+ return id;
}
@Override
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/WireTapProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/WireTapProcessor.java
index 8ec1f0c..5f79bbd 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/WireTapProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/WireTapProcessor.java
@@ -83,7 +83,7 @@ public class WireTapProcessor extends AsyncProcessorSupport implements Traceable
@Override
public String toString() {
- return "WireTap[" + uri + "]";
+ return id;
}
@Override
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/WrapProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/WrapProcessor.java
index a0ebbb1..76a6983 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/WrapProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/WrapProcessor.java
@@ -35,7 +35,7 @@ public class WrapProcessor extends DelegateAsyncProcessor {
@Override
public String toString() {
- return "Wrap[" + wrapped + "] -> " + processor;
+ return "WrapDelegateAsyncProcessor[" + processor + "]";
}
@Override
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
index 71028c1..f894765 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
@@ -264,7 +264,7 @@ public class AggregateProcessor extends AsyncProcessorSupport implements Navigat
@Override
public String toString() {
- return "AggregateProcessor[to: " + processor + "]";
+ return id;
}
@Override
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/idempotent/IdempotentConsumer.java b/core/camel-base/src/main/java/org/apache/camel/processor/idempotent/IdempotentConsumer.java
index 8a24cb3..a9de078 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/idempotent/IdempotentConsumer.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/idempotent/IdempotentConsumer.java
@@ -30,6 +30,7 @@ import org.apache.camel.Navigate;
import org.apache.camel.Processor;
import org.apache.camel.spi.IdAware;
import org.apache.camel.spi.IdempotentRepository;
+import org.apache.camel.spi.RouteIdAware;
import org.apache.camel.spi.Synchronization;
import org.apache.camel.support.AsyncProcessorConverterHelper;
import org.apache.camel.support.AsyncProcessorSupport;
@@ -43,7 +44,7 @@ import org.apache.camel.support.service.ServiceHelper;
*
* @see org.apache.camel.spi.IdempotentRepository
*/
-public class IdempotentConsumer extends AsyncProcessorSupport implements CamelContextAware, Navigate<Processor>, IdAware {
+public class IdempotentConsumer extends AsyncProcessorSupport implements CamelContextAware, Navigate<Processor>, IdAware, RouteIdAware {
private CamelContext camelContext;
private String id;
@@ -70,7 +71,7 @@ public class IdempotentConsumer extends AsyncProcessorSupport implements CamelCo
@Override
public String toString() {
- return "IdempotentConsumer[" + messageIdExpression + " -> " + processor + "]";
+ return id;
}
@Override
diff --git a/core/camel-base/src/main/java/org/apache/camel/processor/saga/SagaProcessor.java b/core/camel-base/src/main/java/org/apache/camel/processor/saga/SagaProcessor.java
index 77f46a8..d387c1a 100644
--- a/core/camel-base/src/main/java/org/apache/camel/processor/saga/SagaProcessor.java
+++ b/core/camel-base/src/main/java/org/apache/camel/processor/saga/SagaProcessor.java
@@ -22,16 +22,22 @@ import org.apache.camel.AsyncCallback;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
+import org.apache.camel.Traceable;
import org.apache.camel.saga.CamelSagaCoordinator;
import org.apache.camel.saga.CamelSagaService;
import org.apache.camel.saga.CamelSagaStep;
+import org.apache.camel.spi.IdAware;
+import org.apache.camel.spi.RouteIdAware;
import org.apache.camel.support.processor.DelegateAsyncProcessor;
import org.apache.camel.util.ObjectHelper;
/**
* Processor for handling sagas.
*/
-public abstract class SagaProcessor extends DelegateAsyncProcessor {
+public abstract class SagaProcessor extends DelegateAsyncProcessor implements Traceable, IdAware, RouteIdAware {
+
+ private String id;
+ private String routeId;
protected CamelContext camelContext;
@@ -92,7 +98,32 @@ public abstract class SagaProcessor extends DelegateAsyncProcessor {
}
@Override
+ public String getId() {
+ return id;
+ }
+
+ @Override
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ @Override
+ public String getRouteId() {
+ return routeId;
+ }
+
+ @Override
+ public void setRouteId(String routeId) {
+ this.routeId = routeId;
+ }
+
+ @Override
public String toString() {
+ return "id";
+ }
+
+ @Override
+ public String getTraceLabel() {
return "saga";
}
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedValidatorRegistryTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedValidatorRegistryTest.java
index c5eca35..4bee79a 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedValidatorRegistryTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedValidatorRegistryTest.java
@@ -16,14 +16,12 @@
*/
package org.apache.camel.management;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import javax.management.openmbean.CompositeData;
import javax.management.openmbean.TabularData;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
import org.apache.camel.Message;
import org.apache.camel.ValidationException;
@@ -31,11 +29,8 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.spi.DataType;
import org.apache.camel.spi.Validator;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class ManagedValidatorRegistryTest extends ManagementTestSupport {
- private static final Logger LOG = LoggerFactory.getLogger(ManagedValidatorRegistryTest.class);
@Test
public void testManageValidatorRegistry() throws Exception {
@@ -80,29 +75,7 @@ public class ManagedValidatorRegistryTest extends ManagementTestSupport {
assertTrue(source.startsWith("ValidatorRegistry"));
assertTrue(source.endsWith("capacity: 1000"));
-
TabularData data = (TabularData) mbeanServer.invoke(on, "listValidators", null, null);
- for (Object row : data.values()) {
- CompositeData composite = (CompositeData)row;
- String type = (String)composite.get("type");
- String description = (String)composite.get("description");
- boolean isStatic = (boolean)composite.get("static");
- boolean isDynamic = (boolean)composite.get("dynamic");
- LOG.info("[{}][{}][{}][{}]", type, isStatic, isDynamic, description);
- if (description.startsWith("ProcessorValidator")) {
- if (description.contains("direct://transformer")) {
- assertEquals("xml:foo", type);
- } else if (description.contains("validate(simple{${body}} is not null")) {
- assertEquals("json:test", type);
- } else {
- fail("Unexpected validator:" + description);
- }
- } else if (description.startsWith("MyValidator")) {
- assertEquals("custom", type);
- } else {
- fail("Unexpected validator:" + description);
- }
- }
assertEquals(3, data.size());
}
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/processor/CamelLogProcessor.java b/core/camel-support/src/main/java/org/apache/camel/support/processor/CamelLogProcessor.java
index f614fdb..064b505 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/processor/CamelLogProcessor.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/processor/CamelLogProcessor.java
@@ -64,7 +64,7 @@ public class CamelLogProcessor extends AsyncProcessorSupport implements IdAware,
@Override
public String toString() {
- return "Logger[" + logger + "]";
+ return id;
}
@Override