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 2014/12/30 11:42:23 UTC
[07/29] camel git commit: CAMEL-7999: DSL should use consistent
shortName which uses the name from the JAXB annotations
CAMEL-7999: DSL should use consistent shortName which uses the name from the JAXB annotations
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d8a49f26
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d8a49f26
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d8a49f26
Branch: refs/heads/master
Commit: d8a49f26ec4118a438520470002115edcd8ae4af
Parents: 3f15fe0
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Dec 26 12:27:56 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Dec 30 10:56:40 2014 +0100
----------------------------------------------------------------------
.../org/apache/camel/model/AOPDefinition.java | 5 -----
.../apache/camel/model/AggregateDefinition.java | 5 -----
.../org/apache/camel/model/BeanDefinition.java | 5 -----
.../org/apache/camel/model/CatchDefinition.java | 5 -----
.../apache/camel/model/ChoiceDefinition.java | 5 -----
.../camel/model/ConvertBodyDefinition.java | 5 -----
.../org/apache/camel/model/DelayDefinition.java | 5 -----
.../camel/model/DynamicRouterDefinition.java | 5 -----
.../apache/camel/model/EnrichDefinition.java | 5 -----
.../org/apache/camel/model/ExpressionNode.java | 2 +-
.../apache/camel/model/FilterDefinition.java | 5 -----
.../apache/camel/model/FinallyDefinition.java | 5 -----
.../org/apache/camel/model/FromDefinition.java | 5 -----
.../model/IdempotentConsumerDefinition.java | 5 -----
.../apache/camel/model/InOnlyDefinition.java | 5 -----
.../org/apache/camel/model/InOutDefinition.java | 5 -----
.../apache/camel/model/InterceptDefinition.java | 5 -----
.../camel/model/InterceptFromDefinition.java | 5 -----
.../InterceptSendToEndpointDefinition.java | 7 ++-----
.../camel/model/LoadBalanceDefinition.java | 5 -----
.../org/apache/camel/model/LogDefinition.java | 5 -----
.../org/apache/camel/model/LoopDefinition.java | 5 -----
.../apache/camel/model/MarshalDefinition.java | 5 -----
.../apache/camel/model/MulticastDefinition.java | 5 -----
.../camel/model/OnCompletionDefinition.java | 5 -----
.../camel/model/OnExceptionDefinition.java | 5 -----
.../apache/camel/model/OtherwiseDefinition.java | 5 -----
.../apache/camel/model/OutputDefinition.java | 22 ++++++++++++++++++--
.../apache/camel/model/PipelineDefinition.java | 5 -----
.../camel/model/PollEnrichDefinition.java | 5 -----
.../apache/camel/model/ProcessDefinition.java | 5 -----
.../camel/model/RecipientListDefinition.java | 5 -----
.../camel/model/RemoveHeaderDefinition.java | 5 -----
.../camel/model/RemoveHeadersDefinition.java | 5 -----
.../camel/model/RemovePropertiesDefinition.java | 5 -----
.../camel/model/RemovePropertyDefinition.java | 5 -----
.../camel/model/ResequenceDefinition.java | 5 -----
.../apache/camel/model/RollbackDefinition.java | 5 -----
.../org/apache/camel/model/RouteDefinition.java | 5 -----
.../apache/camel/model/RoutesDefinition.java | 5 -----
.../camel/model/RoutingSlipDefinition.java | 5 -----
.../apache/camel/model/SamplingDefinition.java | 5 -----
.../apache/camel/model/SetBodyDefinition.java | 5 -----
.../model/SetExchangePatternDefinition.java | 5 -----
.../camel/model/SetFaultBodyDefinition.java | 5 -----
.../apache/camel/model/SetHeaderDefinition.java | 5 -----
.../camel/model/SetOutHeaderDefinition.java | 5 -----
.../camel/model/SetPropertyDefinition.java | 5 -----
.../org/apache/camel/model/SortDefinition.java | 5 -----
.../org/apache/camel/model/SplitDefinition.java | 5 -----
.../org/apache/camel/model/StopDefinition.java | 5 -----
.../apache/camel/model/ThreadsDefinition.java | 5 -----
.../apache/camel/model/ThrottleDefinition.java | 5 -----
.../camel/model/ThrowExceptionDefinition.java | 5 -----
.../org/apache/camel/model/ToDefinition.java | 5 -----
.../camel/model/TransactedDefinition.java | 5 -----
.../apache/camel/model/TransformDefinition.java | 5 -----
.../org/apache/camel/model/TryDefinition.java | 5 -----
.../apache/camel/model/UnmarshalDefinition.java | 5 -----
.../apache/camel/model/ValidateDefinition.java | 5 -----
.../org/apache/camel/model/WhenDefinition.java | 5 -----
.../apache/camel/model/WireTapDefinition.java | 5 -----
.../camel/model/rest/RestBindingDefinition.java | 5 -----
.../camel/model/rest/RestsDefinition.java | 5 -----
64 files changed, 23 insertions(+), 313 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/AOPDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/AOPDefinition.java b/camel-core/src/main/java/org/apache/camel/model/AOPDefinition.java
index e13d145..638db7b 100644
--- a/camel-core/src/main/java/org/apache/camel/model/AOPDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/AOPDefinition.java
@@ -78,11 +78,6 @@ public class AOPDefinition extends OutputDefinition<AOPDefinition> {
}
@Override
- public String getShortName() {
- return "aop";
- }
-
- @Override
public String getLabel() {
return "aop";
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java b/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
index 59c2104..10c0872 100644
--- a/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
@@ -147,11 +147,6 @@ public class AggregateDefinition extends ProcessorDefinition<AggregateDefinition
}
@Override
- public String getShortName() {
- return "aggregate";
- }
-
- @Override
public String getLabel() {
return "aggregate[" + description() + "]";
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java b/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java
index a8789bf..2f738af 100644
--- a/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java
@@ -98,11 +98,6 @@ public class BeanDefinition extends NoOutputDefinition<BeanDefinition> {
return "bean[" + description() + "]";
}
- @Override
- public String getShortName() {
- return "bean";
- }
-
public String getRef() {
return ref;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java b/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java
index be3bdbe..7484363 100644
--- a/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java
@@ -74,11 +74,6 @@ public class CatchDefinition extends ProcessorDefinition<CatchDefinition> {
}
@Override
- public String getShortName() {
- return "doCatch";
- }
-
- @Override
public String getLabel() {
return "doCatch[ " + getExceptionClasses() + "]";
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java
index 202f86a..718a9d6 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java
@@ -124,11 +124,6 @@ public class ChoiceDefinition extends ProcessorDefinition<ChoiceDefinition> {
}
@Override
- public String getShortName() {
- return "choice";
- }
-
- @Override
public Processor createProcessor(RouteContext routeContext) throws Exception {
List<Processor> filters = new ArrayList<Processor>();
for (WhenDefinition whenClause : whenClauses) {
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/ConvertBodyDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/ConvertBodyDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ConvertBodyDefinition.java
index c2c0b78..0bffd84 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ConvertBodyDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ConvertBodyDefinition.java
@@ -67,11 +67,6 @@ public class ConvertBodyDefinition extends NoOutputDefinition<ConvertBodyDefinit
}
@Override
- public String getShortName() {
- return "convertBodyTo";
- }
-
- @Override
public String getLabel() {
return "convertBodyTo[" + getType() + "]";
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java b/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java
index 6657a76..193b502 100644
--- a/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java
@@ -64,11 +64,6 @@ public class DelayDefinition extends ExpressionNode implements ExecutorServiceAw
}
@Override
- public String getShortName() {
- return "delay";
- }
-
- @Override
public String toString() {
return "Delay[" + getExpression() + " -> " + getOutputs() + "]";
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/DynamicRouterDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/DynamicRouterDefinition.java b/camel-core/src/main/java/org/apache/camel/model/DynamicRouterDefinition.java
index 9a486fb..3f174c8 100644
--- a/camel-core/src/main/java/org/apache/camel/model/DynamicRouterDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/DynamicRouterDefinition.java
@@ -60,11 +60,6 @@ public class DynamicRouterDefinition<Type extends ProcessorDefinition<Type>> ext
}
@Override
- public String getShortName() {
- return "dynamicRouter";
- }
-
- @Override
public List<ProcessorDefinition<?>> getOutputs() {
return Collections.emptyList();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/EnrichDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/EnrichDefinition.java b/camel-core/src/main/java/org/apache/camel/model/EnrichDefinition.java
index 789f84b..00f3738 100644
--- a/camel-core/src/main/java/org/apache/camel/model/EnrichDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/EnrichDefinition.java
@@ -83,11 +83,6 @@ public class EnrichDefinition extends NoOutputDefinition<EnrichDefinition> imple
}
@Override
- public String getShortName() {
- return "enrich";
- }
-
- @Override
public String getEndpointUri() {
if (resourceUri != null) {
return resourceUri;
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java b/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java
index 2e1f764..071a9ad 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java
@@ -37,7 +37,7 @@ import org.apache.camel.spi.RouteContext;
* @version
*/
@XmlAccessorType(XmlAccessType.FIELD)
-public class ExpressionNode extends ProcessorDefinition<ExpressionNode> {
+public abstract class ExpressionNode extends ProcessorDefinition<ExpressionNode> {
@XmlElementRef
private ExpressionDefinition expression;
@XmlElementRef
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/FilterDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/FilterDefinition.java b/camel-core/src/main/java/org/apache/camel/model/FilterDefinition.java
index a7c6ece..e9218fd 100644
--- a/camel-core/src/main/java/org/apache/camel/model/FilterDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/FilterDefinition.java
@@ -57,11 +57,6 @@ public class FilterDefinition extends ExpressionNode {
}
@Override
- public String getShortName() {
- return "filter";
- }
-
- @Override
public FilterProcessor createProcessor(RouteContext routeContext) throws Exception {
return createFilterProcessor(routeContext);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/FinallyDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/FinallyDefinition.java b/camel-core/src/main/java/org/apache/camel/model/FinallyDefinition.java
index 836ef62..c7e84de 100644
--- a/camel-core/src/main/java/org/apache/camel/model/FinallyDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/FinallyDefinition.java
@@ -44,11 +44,6 @@ public class FinallyDefinition extends OutputDefinition<FinallyDefinition> {
}
@Override
- public String getShortName() {
- return "doFinally";
- }
-
- @Override
public Processor createProcessor(RouteContext routeContext) throws Exception {
// parent must be a try
if (!(getParent() instanceof TryDefinition)) {
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java b/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java
index f6fdf72..3e9d725 100644
--- a/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java
@@ -58,11 +58,6 @@ public class FromDefinition extends OptionalIdentifiedDefinition<FromDefinition>
return "From[" + getLabel() + "]";
}
- @Override
- public String getShortName() {
- return "from";
- }
-
public String getLabel() {
return description(getUri(), getRef(), getEndpoint());
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerDefinition.java b/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerDefinition.java
index 2e17f32..6159de1 100644
--- a/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerDefinition.java
@@ -64,11 +64,6 @@ public class IdempotentConsumerDefinition extends ExpressionNode {
return "idempotentConsumer[" + getExpression() + "]";
}
- @Override
- public String getShortName() {
- return "idempotentConsumer";
- }
-
// Fluent API
//-------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/InOnlyDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/InOnlyDefinition.java b/camel-core/src/main/java/org/apache/camel/model/InOnlyDefinition.java
index 3e63940..759494e 100644
--- a/camel-core/src/main/java/org/apache/camel/model/InOnlyDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/InOnlyDefinition.java
@@ -54,11 +54,6 @@ public class InOnlyDefinition extends SendDefinition<InOnlyDefinition> {
}
@Override
- public String getShortName() {
- return "inOnly";
- }
-
- @Override
public ExchangePattern getPattern() {
return ExchangePattern.InOnly;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/InOutDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/InOutDefinition.java b/camel-core/src/main/java/org/apache/camel/model/InOutDefinition.java
index a7f13c9..372ebd7 100644
--- a/camel-core/src/main/java/org/apache/camel/model/InOutDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/InOutDefinition.java
@@ -54,11 +54,6 @@ public class InOutDefinition extends SendDefinition<InOutDefinition> {
}
@Override
- public String getShortName() {
- return "inOut";
- }
-
- @Override
public ExchangePattern getPattern() {
return ExchangePattern.InOut;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java b/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java
index b712e6d..e4fb4b4 100644
--- a/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java
@@ -52,11 +52,6 @@ public class InterceptDefinition extends OutputDefinition<InterceptDefinition> {
}
@Override
- public String getShortName() {
- return "intercept";
- }
-
- @Override
public String getLabel() {
return "intercept";
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/InterceptFromDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/InterceptFromDefinition.java b/camel-core/src/main/java/org/apache/camel/model/InterceptFromDefinition.java
index 39edf10..3b358b4 100644
--- a/camel-core/src/main/java/org/apache/camel/model/InterceptFromDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/InterceptFromDefinition.java
@@ -50,11 +50,6 @@ public class InterceptFromDefinition extends InterceptDefinition {
}
@Override
- public String getShortName() {
- return "interceptFrom";
- }
-
- @Override
public String getLabel() {
return "interceptFrom";
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java b/camel-core/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java
index be2dcb9..75467e1 100644
--- a/camel-core/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java
@@ -42,6 +42,8 @@ import org.apache.camel.util.URISupport;
@XmlAccessorType(XmlAccessType.FIELD)
public class InterceptSendToEndpointDefinition extends OutputDefinition<InterceptSendToEndpointDefinition> {
+ // TODO: name miss-match: XML=interceptToEndpoint, Java=interceptSendToEndpoint
+
// TODO: Support lookup endpoint by ref (requires a bit more work)
// TODO: interceptSendToEndpoint needs to proxy the endpoints at very first
@@ -67,11 +69,6 @@ public class InterceptSendToEndpointDefinition extends OutputDefinition<Intercep
}
@Override
- public String getShortName() {
- return "interceptSendToEndpoint";
- }
-
- @Override
public String getLabel() {
return "interceptSendToEndpoint[" + uri + "]";
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java b/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java
index 985db35..2ec633a 100644
--- a/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java
@@ -79,11 +79,6 @@ public class LoadBalanceDefinition extends ProcessorDefinition<LoadBalanceDefini
}
@Override
- public String getShortName() {
- return "loadbalance";
- }
-
- @Override
public List<ProcessorDefinition<?>> getOutputs() {
return outputs;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java b/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java
index 27f6c20..b736230 100644
--- a/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java
@@ -76,11 +76,6 @@ public class LogDefinition extends NoOutputDefinition<LogDefinition> {
}
@Override
- public String getShortName() {
- return "log";
- }
-
- @Override
public Processor createProcessor(RouteContext routeContext) throws Exception {
ObjectHelper.notEmpty(message, "message", this);
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/LoopDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/LoopDefinition.java b/camel-core/src/main/java/org/apache/camel/model/LoopDefinition.java
index 345698e..3d259f3 100644
--- a/camel-core/src/main/java/org/apache/camel/model/LoopDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/LoopDefinition.java
@@ -92,11 +92,6 @@ public class LoopDefinition extends ExpressionNode {
}
@Override
- public String getShortName() {
- return "loop";
- }
-
- @Override
public Processor createProcessor(RouteContext routeContext) throws Exception {
Processor output = this.createChildProcessor(routeContext, true);
return new LoopProcessor(output, getExpression().createExpression(routeContext), isCopy());
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java b/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java
index e6bc9b3..1e87124 100644
--- a/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java
@@ -136,11 +136,6 @@ public class MarshalDefinition extends NoOutputDefinition<MarshalDefinition> {
return "marshal[" + description() + "]";
}
- @Override
- public String getShortName() {
- return "marshal";
- }
-
public String getRef() {
return ref;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/MulticastDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/MulticastDefinition.java b/camel-core/src/main/java/org/apache/camel/model/MulticastDefinition.java
index 9f5b606..8a50f49 100644
--- a/camel-core/src/main/java/org/apache/camel/model/MulticastDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/MulticastDefinition.java
@@ -86,11 +86,6 @@ public class MulticastDefinition extends OutputDefinition<MulticastDefinition> i
}
@Override
- public String getShortName() {
- return "multicast";
- }
-
- @Override
public Processor createProcessor(RouteContext routeContext) throws Exception {
Processor answer = this.createChildProcessor(routeContext, true);
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java b/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java
index 1e2bb7e..096ce1d 100644
--- a/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java
@@ -91,11 +91,6 @@ public class OnCompletionDefinition extends ProcessorDefinition<OnCompletionDefi
}
@Override
- public String getShortName() {
- return "onCompletion";
- }
-
- @Override
public String getLabel() {
return "onCompletion";
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java b/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
index 829f402..ba98d4c 100644
--- a/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
@@ -112,11 +112,6 @@ public class OnExceptionDefinition extends ProcessorDefinition<OnExceptionDefini
}
@Override
- public String getShortName() {
- return "onException";
- }
-
- @Override
public String toString() {
return "OnException[" + description() + " -> " + getOutputs() + "]";
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/OtherwiseDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/OtherwiseDefinition.java b/camel-core/src/main/java/org/apache/camel/model/OtherwiseDefinition.java
index 57615ed..86157e0 100644
--- a/camel-core/src/main/java/org/apache/camel/model/OtherwiseDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/OtherwiseDefinition.java
@@ -48,11 +48,6 @@ public class OtherwiseDefinition extends OutputDefinition<OtherwiseDefinition> {
}
@Override
- public String getShortName() {
- return "otherwise";
- }
-
- @Override
public String getLabel() {
CollectionStringBuffer buffer = new CollectionStringBuffer("otherwise[");
List<ProcessorDefinition<?>> list = getOutputs();
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/OutputDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/OutputDefinition.java b/camel-core/src/main/java/org/apache/camel/model/OutputDefinition.java
index 6bdaf9a..ecfafdc 100644
--- a/camel-core/src/main/java/org/apache/camel/model/OutputDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/OutputDefinition.java
@@ -21,6 +21,8 @@ import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElementRef;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
/**
@@ -30,7 +32,11 @@ import javax.xml.bind.annotation.XmlType;
*/
@XmlType(name = "output")
@XmlAccessorType(XmlAccessType.FIELD)
-public class OutputDefinition<Type extends ProcessorDefinition<Type>> extends ProcessorDefinition<Type> {
+public abstract class OutputDefinition<Type extends ProcessorDefinition<Type>> extends ProcessorDefinition<Type> {
+
+ @XmlTransient
+ private String shortName;
+
@XmlElementRef
protected List<ProcessorDefinition<?>> outputs = new ArrayList<ProcessorDefinition<?>>();
@@ -53,7 +59,19 @@ public class OutputDefinition<Type extends ProcessorDefinition<Type>> extends Pr
@Override
public String getShortName() {
- return "output";
+ if (shortName == null) {
+ XmlRootElement root = getClass().getAnnotation(XmlRootElement.class);
+ if (root != null) {
+ shortName = root.name();
+ }
+ if (shortName == null) {
+ XmlType type = getClass().getAnnotation(XmlType.class);
+ if (type != null) {
+ shortName = type.name();
+ }
+ }
+ }
+ return shortName;
}
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/PipelineDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/PipelineDefinition.java b/camel-core/src/main/java/org/apache/camel/model/PipelineDefinition.java
index 2dd2685..8146616 100644
--- a/camel-core/src/main/java/org/apache/camel/model/PipelineDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/PipelineDefinition.java
@@ -37,11 +37,6 @@ public class PipelineDefinition extends OutputDefinition<PipelineDefinition> {
}
@Override
- public String getShortName() {
- return "pipeline";
- }
-
- @Override
public String getLabel() {
return "pipeline";
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/PollEnrichDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/PollEnrichDefinition.java b/camel-core/src/main/java/org/apache/camel/model/PollEnrichDefinition.java
index ac5a323..cc7ef04 100644
--- a/camel-core/src/main/java/org/apache/camel/model/PollEnrichDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/PollEnrichDefinition.java
@@ -76,11 +76,6 @@ public class PollEnrichDefinition extends NoOutputDefinition<PollEnrichDefinitio
}
@Override
- public String getShortName() {
- return "pollEnrich";
- }
-
- @Override
public String getLabel() {
return "pollEnrich[" + description() + "]";
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/ProcessDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/ProcessDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ProcessDefinition.java
index 03c9b2d..fae5610 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ProcessDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ProcessDefinition.java
@@ -52,11 +52,6 @@ public class ProcessDefinition extends NoOutputDefinition<ProcessDefinition> {
}
@Override
- public String getShortName() {
- return "process";
- }
-
- @Override
public String toString() {
return "process["
+ ((ref != null) ? "ref:" + ref : processor)
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java b/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java
index b3b6ab5..c7a3051 100644
--- a/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java
@@ -98,11 +98,6 @@ public class RecipientListDefinition<Type extends ProcessorDefinition<Type>> ext
}
@Override
- public String getShortName() {
- return "recipientList";
- }
-
- @Override
public String getLabel() {
return "recipientList[" + getExpression() + "]";
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/RemoveHeaderDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/RemoveHeaderDefinition.java b/camel-core/src/main/java/org/apache/camel/model/RemoveHeaderDefinition.java
index 6b032ee..5ec2934 100644
--- a/camel-core/src/main/java/org/apache/camel/model/RemoveHeaderDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/RemoveHeaderDefinition.java
@@ -48,11 +48,6 @@ public class RemoveHeaderDefinition extends NoOutputDefinition<RemoveHeaderDefin
}
@Override
- public String getShortName() {
- return "removeHeader";
- }
-
- @Override
public String getLabel() {
return "removeHeader[" + getHeaderName() + "]";
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/RemoveHeadersDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/RemoveHeadersDefinition.java b/camel-core/src/main/java/org/apache/camel/model/RemoveHeadersDefinition.java
index 022183e..f219546 100644
--- a/camel-core/src/main/java/org/apache/camel/model/RemoveHeadersDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/RemoveHeadersDefinition.java
@@ -59,11 +59,6 @@ public class RemoveHeadersDefinition extends NoOutputDefinition<RemoveHeadersDef
}
@Override
- public String getShortName() {
- return "removeHeaders";
- }
-
- @Override
public String getLabel() {
return "removeHeaders[" + getPattern() + "]";
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/RemovePropertiesDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/RemovePropertiesDefinition.java b/camel-core/src/main/java/org/apache/camel/model/RemovePropertiesDefinition.java
index fcae605..2ff38d5 100644
--- a/camel-core/src/main/java/org/apache/camel/model/RemovePropertiesDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/RemovePropertiesDefinition.java
@@ -59,11 +59,6 @@ public class RemovePropertiesDefinition extends NoOutputDefinition<RemovePropert
}
@Override
- public String getShortName() {
- return "removeProperties";
- }
-
- @Override
public String getLabel() {
return "removeProperties[" + getPattern() + "]";
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/RemovePropertyDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/RemovePropertyDefinition.java b/camel-core/src/main/java/org/apache/camel/model/RemovePropertyDefinition.java
index 817a2f0..ce9e844 100644
--- a/camel-core/src/main/java/org/apache/camel/model/RemovePropertyDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/RemovePropertyDefinition.java
@@ -48,11 +48,6 @@ public class RemovePropertyDefinition extends NoOutputDefinition<RemovePropertyD
}
@Override
- public String getShortName() {
- return "removeProperty";
- }
-
- @Override
public String getLabel() {
return "removeProperty[" + getPropertyName() + "]";
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java
index faae5a9..6dd36e3 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java
@@ -67,11 +67,6 @@ public class ResequenceDefinition extends ProcessorDefinition<ResequenceDefiniti
public ResequenceDefinition() {
}
- @Override
- public String getShortName() {
- return "resequence";
- }
-
public List<ProcessorDefinition<?>> getOutputs() {
return outputs;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/RollbackDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/RollbackDefinition.java b/camel-core/src/main/java/org/apache/camel/model/RollbackDefinition.java
index aebdc12..90173d7 100644
--- a/camel-core/src/main/java/org/apache/camel/model/RollbackDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/RollbackDefinition.java
@@ -46,11 +46,6 @@ public class RollbackDefinition extends NoOutputDefinition<RollbackDefinition> {
}
@Override
- public String getShortName() {
- return "rollback";
- }
-
- @Override
public String toString() {
if (message != null) {
return "Rollback[" + message + "]";
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java b/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
index 723c953..989eccc 100644
--- a/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
@@ -135,11 +135,6 @@ public class RouteDefinition extends ProcessorDefinition<RouteDefinition> {
}
}
- @Override
- public String getShortName() {
- return "route";
- }
-
/**
* Returns the status of the route if it has been registered with a {@link CamelContext}
*/
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/RoutesDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/RoutesDefinition.java b/camel-core/src/main/java/org/apache/camel/model/RoutesDefinition.java
index ab99fe0..8582f67 100644
--- a/camel-core/src/main/java/org/apache/camel/model/RoutesDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/RoutesDefinition.java
@@ -60,11 +60,6 @@ public class RoutesDefinition extends OptionalIdentifiedDefinition<RoutesDefinit
return "Routes: " + routes;
}
- @Override
- public String getShortName() {
- return "routes";
- }
-
public String getLabel() {
return "Route " + getId();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java b/camel-core/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java
index bfc3173..eecfa73 100644
--- a/camel-core/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java
@@ -72,11 +72,6 @@ public class RoutingSlipDefinition<Type extends ProcessorDefinition<Type>> exten
}
@Override
- public String getShortName() {
- return "routingSlip";
- }
-
- @Override
public String getLabel() {
return "routingSlip[" + getExpression() + "]";
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java b/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java
index 04f8d37..c691663 100644
--- a/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java
@@ -77,11 +77,6 @@ public class SamplingDefinition extends OutputDefinition<SamplingDefinition> {
}
@Override
- public String getShortName() {
- return "sample";
- }
-
- @Override
public String getLabel() {
return "sample[" + description() + "]";
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/SetBodyDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/SetBodyDefinition.java b/camel-core/src/main/java/org/apache/camel/model/SetBodyDefinition.java
index 07878b8..ffd32fe 100644
--- a/camel-core/src/main/java/org/apache/camel/model/SetBodyDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/SetBodyDefinition.java
@@ -45,11 +45,6 @@ public class SetBodyDefinition extends NoOutputExpressionNode {
}
@Override
- public String getShortName() {
- return "setBody";
- }
-
- @Override
public String getLabel() {
return "setBody[" + getExpression() + "]";
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/SetExchangePatternDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/SetExchangePatternDefinition.java b/camel-core/src/main/java/org/apache/camel/model/SetExchangePatternDefinition.java
index 3cec279..03a135c 100644
--- a/camel-core/src/main/java/org/apache/camel/model/SetExchangePatternDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/SetExchangePatternDefinition.java
@@ -61,11 +61,6 @@ public class SetExchangePatternDefinition extends NoOutputDefinition<SetExchange
}
@Override
- public String getShortName() {
- return "setExchangePattern";
- }
-
- @Override
public String toString() {
return "setExchangePattern[pattern: " + pattern + "]";
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/SetFaultBodyDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/SetFaultBodyDefinition.java b/camel-core/src/main/java/org/apache/camel/model/SetFaultBodyDefinition.java
index 14db2af..9fe5512 100644
--- a/camel-core/src/main/java/org/apache/camel/model/SetFaultBodyDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/SetFaultBodyDefinition.java
@@ -45,11 +45,6 @@ public class SetFaultBodyDefinition extends NoOutputExpressionNode {
}
@Override
- public String getShortName() {
- return "setFaultBody";
- }
-
- @Override
public String getLabel() {
return "setFaultBody[" + getExpression() + "]";
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/SetHeaderDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/SetHeaderDefinition.java b/camel-core/src/main/java/org/apache/camel/model/SetHeaderDefinition.java
index 711339e..f73000e 100644
--- a/camel-core/src/main/java/org/apache/camel/model/SetHeaderDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/SetHeaderDefinition.java
@@ -63,11 +63,6 @@ public class SetHeaderDefinition extends NoOutputExpressionNode {
}
@Override
- public String getShortName() {
- return "setHeader";
- }
-
- @Override
public String getLabel() {
return "setHeader[" + getHeaderName() + "]";
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/SetOutHeaderDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/SetOutHeaderDefinition.java b/camel-core/src/main/java/org/apache/camel/model/SetOutHeaderDefinition.java
index 3eb2dff..22b812e 100644
--- a/camel-core/src/main/java/org/apache/camel/model/SetOutHeaderDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/SetOutHeaderDefinition.java
@@ -65,11 +65,6 @@ public class SetOutHeaderDefinition extends NoOutputExpressionNode {
}
@Override
- public String getShortName() {
- return "setOutHeader";
- }
-
- @Override
public Processor createProcessor(RouteContext routeContext) throws Exception {
ObjectHelper.notNull(getHeaderName(), "headerName", this);
Expression expr = getExpression().createExpression(routeContext);
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/SetPropertyDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/SetPropertyDefinition.java b/camel-core/src/main/java/org/apache/camel/model/SetPropertyDefinition.java
index 713f3d9..69f3fbb 100644
--- a/camel-core/src/main/java/org/apache/camel/model/SetPropertyDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/SetPropertyDefinition.java
@@ -68,11 +68,6 @@ public class SetPropertyDefinition extends NoOutputExpressionNode {
}
@Override
- public String getShortName() {
- return "setProperty";
- }
-
- @Override
public Processor createProcessor(RouteContext routeContext) throws Exception {
ObjectHelper.notNull(getPropertyName(), "propertyName", this);
Expression expr = getExpression().createExpression(routeContext);
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java b/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java
index bb266d3..dd44e80 100644
--- a/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java
@@ -65,11 +65,6 @@ public class SortDefinition<T> extends NoOutputExpressionNode {
}
@Override
- public String getShortName() {
- return "sort";
- }
-
- @Override
@SuppressWarnings("unchecked")
public Processor createProcessor(RouteContext routeContext) throws Exception {
// lookup in registry
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java b/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java
index aa1a102..c1386f7 100644
--- a/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java
@@ -89,11 +89,6 @@ public class SplitDefinition extends ExpressionNode implements ExecutorServiceAw
}
@Override
- public String getShortName() {
- return "split";
- }
-
- @Override
public String getLabel() {
return "split[" + getExpression() + "]";
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/StopDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/StopDefinition.java b/camel-core/src/main/java/org/apache/camel/model/StopDefinition.java
index daa05af..c0713e7 100644
--- a/camel-core/src/main/java/org/apache/camel/model/StopDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/StopDefinition.java
@@ -37,11 +37,6 @@ public class StopDefinition extends NoOutputDefinition<StopDefinition> {
}
@Override
- public String getShortName() {
- return "stop";
- }
-
- @Override
public Processor createProcessor(RouteContext routeContext) throws Exception {
return new StopProcessor();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java
index b93631e..b08bb79 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java
@@ -160,11 +160,6 @@ public class ThreadsDefinition extends OutputDefinition<ThreadsDefinition> imple
}
@Override
- public String getShortName() {
- return "threads";
- }
-
- @Override
public String toString() {
return "Threads[" + getOutputs() + "]";
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java
index 2a14052..62d4d99 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java
@@ -71,11 +71,6 @@ public class ThrottleDefinition extends ExpressionNode implements ExecutorServic
}
@Override
- public String getShortName() {
- return "throttle";
- }
-
- @Override
public String getLabel() {
return "throttle[" + description() + "]";
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java
index 1fc5592..2369715 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java
@@ -43,11 +43,6 @@ public class ThrowExceptionDefinition extends NoOutputDefinition<ThrowExceptionD
}
@Override
- public String getShortName() {
- return "throwException";
- }
-
- @Override
public String toString() {
return "ThrowException[" + description() + "]";
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/ToDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/ToDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ToDefinition.java
index 3df4ea5..dc4936b 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ToDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ToDefinition.java
@@ -62,11 +62,6 @@ public class ToDefinition extends SendDefinition<ToDefinition> {
}
@Override
- public String getShortName() {
- return "to";
- }
-
- @Override
public ExchangePattern getPattern() {
return pattern;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/TransactedDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/TransactedDefinition.java b/camel-core/src/main/java/org/apache/camel/model/TransactedDefinition.java
index 3b85b37..ed856c5 100644
--- a/camel-core/src/main/java/org/apache/camel/model/TransactedDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/TransactedDefinition.java
@@ -85,11 +85,6 @@ public class TransactedDefinition extends OutputDefinition<TransactedDefinition>
}
@Override
- public String getShortName() {
- return "transacted";
- }
-
- @Override
public String getLabel() {
return "transacted[" + description() + "]";
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/TransformDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/TransformDefinition.java b/camel-core/src/main/java/org/apache/camel/model/TransformDefinition.java
index 81718b3..3dcd6b7 100644
--- a/camel-core/src/main/java/org/apache/camel/model/TransformDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/TransformDefinition.java
@@ -45,11 +45,6 @@ public class TransformDefinition extends NoOutputExpressionNode {
}
@Override
- public String getShortName() {
- return "transform";
- }
-
- @Override
public String getLabel() {
return "transform[" + getExpression() + "]";
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java b/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java
index 5ef243e..60ba0d6 100644
--- a/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java
@@ -59,11 +59,6 @@ public class TryDefinition extends OutputDefinition<TryDefinition> {
}
@Override
- public String getShortName() {
- return "doTry";
- }
-
- @Override
public String getLabel() {
return "doTry";
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java b/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
index 0e694ba..2c12d58 100644
--- a/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
@@ -136,11 +136,6 @@ public class UnmarshalDefinition extends NoOutputDefinition<UnmarshalDefinition>
}
@Override
- public String getShortName() {
- return "unmarshal";
- }
-
- @Override
public String getLabel() {
return "unmarshal[" + description() + "]";
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/ValidateDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/ValidateDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ValidateDefinition.java
index 088e470..f2702b9 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ValidateDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ValidateDefinition.java
@@ -42,11 +42,6 @@ public class ValidateDefinition extends NoOutputExpressionNode {
}
@Override
- public String getShortName() {
- return "validate";
- }
-
- @Override
public String getLabel() {
return "validate[" + getExpression() + "]";
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/WhenDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/WhenDefinition.java b/camel-core/src/main/java/org/apache/camel/model/WhenDefinition.java
index 2e35f0f..b98a007 100644
--- a/camel-core/src/main/java/org/apache/camel/model/WhenDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/WhenDefinition.java
@@ -63,11 +63,6 @@ public class WhenDefinition extends ExpressionNode {
}
@Override
- public String getShortName() {
- return "when";
- }
-
- @Override
public String getLabel() {
return "when[" + description() + "]";
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/WireTapDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/WireTapDefinition.java b/camel-core/src/main/java/org/apache/camel/model/WireTapDefinition.java
index 88feb1d..20e16dc 100644
--- a/camel-core/src/main/java/org/apache/camel/model/WireTapDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/WireTapDefinition.java
@@ -151,11 +151,6 @@ public class WireTapDefinition<Type extends ProcessorDefinition<Type>> extends N
}
@Override
- public String getShortName() {
- return "wireTap";
- }
-
- @Override
public String getLabel() {
return "wireTap[" + description() + "]";
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java
index 1691ee8..197bcf6 100644
--- a/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java
@@ -63,11 +63,6 @@ public class RestBindingDefinition extends NoOutputDefinition<RestBindingDefinit
}
@Override
- public String getShortName() {
- return "restBinding";
- }
-
- @Override
public Processor createProcessor(RouteContext routeContext) throws Exception {
CamelContext context = routeContext.getCamelContext();
http://git-wip-us.apache.org/repos/asf/camel/blob/d8a49f26/camel-core/src/main/java/org/apache/camel/model/rest/RestsDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestsDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/RestsDefinition.java
index a195c3e..5aab8f9 100644
--- a/camel-core/src/main/java/org/apache/camel/model/rest/RestsDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/rest/RestsDefinition.java
@@ -46,11 +46,6 @@ public class RestsDefinition extends OptionalIdentifiedDefinition<RestsDefinitio
return "Rests: " + rests;
}
- @Override
- public String getShortName() {
- return "rests";
- }
-
public String getLabel() {
return "Rest " + getId();
}