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 2011/02/23 16:25:05 UTC
svn commit: r1073776 - in
/camel/trunk/camel-core/src/main/java/org/apache/camel/model: ./
loadbalancer/
Author: davsclaus
Date: Wed Feb 23 15:25:03 2011
New Revision: 1073776
URL: http://svn.apache.org/viewvc?rev=1073776&view=rev
Log:
CAMEL-3708: Tidy up model to either support or not support outputs.
Added:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/NoOutputDefinition.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ConvertBodyDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/EnrichDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/NoOutputExpressionNode.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/PollEnrichDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RemoveHeaderDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RemoveHeadersDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RemovePropertyDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RollbackDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SendDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetExchangePatternDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetFaultBodyDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetOutHeaderDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/StopDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransactedDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/WhenDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalancerDefinition.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java?rev=1073776&r1=1073775&r2=1073776&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java Wed Feb 23 15:25:03 2011
@@ -687,6 +687,10 @@ public class AggregateDefinition extends
return outputs;
}
+ public boolean isOutputSupported() {
+ return true;
+ }
+
public void setOutputs(List<ProcessorDefinition> outputs) {
this.outputs = outputs;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java?rev=1073776&r1=1073775&r2=1073776&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java Wed Feb 23 15:25:03 2011
@@ -116,6 +116,10 @@ public class CatchDefinition extends Pro
this.outputs = outputs;
}
+ public boolean isOutputSupported() {
+ return true;
+ }
+
public List<Class> getExceptionClasses() {
if (exceptionClasses == null) {
exceptionClasses = createExceptionClasses();
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java?rev=1073776&r1=1073775&r2=1073776&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java Wed Feb 23 15:25:03 2011
@@ -149,6 +149,10 @@ public class ChoiceDefinition extends Pr
}
}
+ public boolean isOutputSupported() {
+ return true;
+ }
+
public OtherwiseDefinition getOtherwise() {
return otherwise;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ConvertBodyDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ConvertBodyDefinition.java?rev=1073776&r1=1073775&r2=1073776&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ConvertBodyDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ConvertBodyDefinition.java Wed Feb 23 15:25:03 2011
@@ -16,9 +16,6 @@
*/
package org.apache.camel.model;
-import java.util.Collections;
-import java.util.List;
-
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
@@ -37,7 +34,7 @@ import org.apache.camel.spi.RouteContext
*/
@XmlRootElement(name = "convertBodyTo")
@XmlAccessorType(XmlAccessType.FIELD)
-public class ConvertBodyDefinition extends ProcessorDefinition<ConvertBodyDefinition> {
+public class ConvertBodyDefinition extends NoOutputDefinition<ConvertBodyDefinition> {
@XmlAttribute
private String type;
@XmlAttribute(required = false)
@@ -90,12 +87,6 @@ public class ConvertBodyDefinition exten
return new ConvertBodyProcessor(getTypeClass(), getCharset());
}
- @Override
- @SuppressWarnings("unchecked")
- public List<ProcessorDefinition> getOutputs() {
- return Collections.EMPTY_LIST;
- }
-
public String getType() {
return type;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java?rev=1073776&r1=1073775&r2=1073776&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java Wed Feb 23 15:25:03 2011
@@ -42,6 +42,8 @@ import org.apache.camel.util.concurrent.
@XmlAccessorType(XmlAccessType.FIELD)
public class DelayDefinition extends ExpressionNode implements ExecutorServiceAwareDefinition<DelayDefinition> {
+ // TODO: Camel 3.0 Should extend NoOutputExpressionNode
+
@XmlTransient
private ExecutorService executorService;
@XmlAttribute(required = false)
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/EnrichDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/EnrichDefinition.java?rev=1073776&r1=1073775&r2=1073776&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/EnrichDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/EnrichDefinition.java Wed Feb 23 15:25:03 2011
@@ -36,17 +36,14 @@ import org.apache.camel.util.ObjectHelpe
*/
@XmlRootElement(name = "enrich")
@XmlAccessorType(XmlAccessType.FIELD)
-public class EnrichDefinition extends OutputDefinition<EnrichDefinition> {
+public class EnrichDefinition extends NoOutputDefinition<EnrichDefinition> {
@XmlAttribute(name = "uri")
private String resourceUri;
-
@XmlAttribute(name = "ref")
private String resourceRef;
-
@XmlAttribute(name = "strategyRef", required = false)
private String aggregationStrategyRef;
-
@XmlTransient
private AggregationStrategy aggregationStrategy;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java?rev=1073776&r1=1073775&r2=1073776&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java Wed Feb 23 15:25:03 2011
@@ -84,6 +84,10 @@ public class ExpressionNode extends Proc
this.outputs = outputs;
}
+ public boolean isOutputSupported() {
+ return true;
+ }
+
@Override
public String getLabel() {
if (getExpression() == null) {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java?rev=1073776&r1=1073775&r2=1073776&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java Wed Feb 23 15:25:03 2011
@@ -93,6 +93,10 @@ public class LoadBalanceDefinition exten
}
}
+ public boolean isOutputSupported() {
+ return true;
+ }
+
public String getRef() {
return ref;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java?rev=1073776&r1=1073775&r2=1073776&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java Wed Feb 23 15:25:03 2011
@@ -16,8 +16,6 @@
*/
package org.apache.camel.model;
-import java.util.Collections;
-import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
@@ -38,7 +36,7 @@ import org.apache.camel.util.ObjectHelpe
*/
@XmlRootElement(name = "log")
@XmlAccessorType(XmlAccessType.FIELD)
-public class LogDefinition extends ProcessorDefinition {
+public class LogDefinition extends NoOutputDefinition {
@XmlAttribute
private String message;
@@ -65,12 +63,6 @@ public class LogDefinition extends Proce
}
@Override
- @SuppressWarnings("unchecked")
- public List<ProcessorDefinition> getOutputs() {
- return Collections.EMPTY_LIST;
- }
-
- @Override
public Processor createProcessor(RouteContext routeContext) throws Exception {
ObjectHelper.notEmpty(message, "message", this);
Added: camel/trunk/camel-core/src/main/java/org/apache/camel/model/NoOutputDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/NoOutputDefinition.java?rev=1073776&view=auto
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/NoOutputDefinition.java (added)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/NoOutputDefinition.java Wed Feb 23 15:25:03 2011
@@ -0,0 +1,35 @@
+/**
+ * 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.model;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Base class for definitions which does not support outputs.
+ */
+public abstract class NoOutputDefinition<Type extends ProcessorDefinition<Type>> extends ProcessorDefinition<Type> {
+
+ @SuppressWarnings("unchecked")
+ public List<ProcessorDefinition> getOutputs() {
+ return Collections.EMPTY_LIST;
+ }
+
+ public boolean isOutputSupported() {
+ return false;
+ }
+}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/NoOutputExpressionNode.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/NoOutputExpressionNode.java?rev=1073776&r1=1073775&r2=1073776&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/NoOutputExpressionNode.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/NoOutputExpressionNode.java Wed Feb 23 15:25:03 2011
@@ -59,6 +59,11 @@ public class NoOutputExpressionNode exte
}
@Override
+ public boolean isOutputSupported() {
+ return false;
+ }
+
+ @Override
public void addOutput(ProcessorDefinition output) {
// add it to the parent as we do not support outputs
getParent().addOutput(output);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java?rev=1073776&r1=1073775&r2=1073776&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java Wed Feb 23 15:25:03 2011
@@ -225,6 +225,10 @@ public class OnCompletionDefinition exte
this.outputs = outputs;
}
+ public boolean isOutputSupported() {
+ return true;
+ }
+
public Boolean getOnCompleteOnly() {
return onCompleteOnly;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java?rev=1073776&r1=1073775&r2=1073776&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java Wed Feb 23 15:25:03 2011
@@ -686,6 +686,10 @@ public class OnExceptionDefinition exten
this.outputs = outputs;
}
+ public boolean isOutputSupported() {
+ return true;
+ }
+
public List<Class> getExceptionClasses() {
if (exceptionClasses == null) {
exceptionClasses = createExceptionClasses();
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputDefinition.java?rev=1073776&r1=1073775&r2=1073776&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputDefinition.java Wed Feb 23 15:25:03 2011
@@ -39,6 +39,10 @@ public class OutputDefinition<Type exten
return outputs;
}
+ public boolean isOutputSupported() {
+ return true;
+ }
+
public void setOutputs(List<ProcessorDefinition> outputs) {
this.outputs = outputs;
if (outputs != null) {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/PollEnrichDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/PollEnrichDefinition.java?rev=1073776&r1=1073775&r2=1073776&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/PollEnrichDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/PollEnrichDefinition.java Wed Feb 23 15:25:03 2011
@@ -36,20 +36,16 @@ import org.apache.camel.util.ObjectHelpe
*/
@XmlRootElement(name = "pollEnrich")
@XmlAccessorType(XmlAccessType.FIELD)
-public class PollEnrichDefinition extends OutputDefinition<PollEnrichDefinition> {
+public class PollEnrichDefinition extends NoOutputDefinition<PollEnrichDefinition> {
@XmlAttribute(name = "uri")
private String resourceUri;
-
@XmlAttribute(name = "ref")
private String resourceRef;
-
@XmlAttribute(name = "timeout")
private Long timeout;
-
@XmlAttribute(name = "strategyRef")
private String aggregationStrategyRef;
-
@XmlTransient
private AggregationStrategy aggregationStrategy;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessDefinition.java?rev=1073776&r1=1073775&r2=1073776&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessDefinition.java Wed Feb 23 15:25:03 2011
@@ -36,7 +36,7 @@ import org.apache.camel.util.ObjectHelpe
*/
@XmlRootElement(name = "process")
@XmlAccessorType(XmlAccessType.FIELD)
-public class ProcessDefinition extends OutputDefinition<ProcessDefinition> {
+public class ProcessDefinition extends NoOutputDefinition<ProcessDefinition> {
@XmlAttribute(required = true)
private String ref;
@XmlTransient
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java?rev=1073776&r1=1073775&r2=1073776&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java Wed Feb 23 15:25:03 2011
@@ -97,6 +97,8 @@ public abstract class ProcessorDefinitio
// else to use an optional attribute in JAXB2
public abstract List<ProcessorDefinition> getOutputs();
+ public abstract boolean isOutputSupported();
+
/**
* Whether this model is abstract or not.
* <p/>
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/RemoveHeaderDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RemoveHeaderDefinition.java?rev=1073776&r1=1073775&r2=1073776&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/RemoveHeaderDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/RemoveHeaderDefinition.java Wed Feb 23 15:25:03 2011
@@ -31,7 +31,7 @@ import org.apache.camel.util.ObjectHelpe
*/
@XmlRootElement(name = "removeHeader")
@XmlAccessorType(XmlAccessType.FIELD)
-public class RemoveHeaderDefinition extends OutputDefinition<RemoveHeaderDefinition> {
+public class RemoveHeaderDefinition extends NoOutputDefinition<RemoveHeaderDefinition> {
@XmlAttribute(required = true)
private String headerName;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/RemoveHeadersDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RemoveHeadersDefinition.java?rev=1073776&r1=1073775&r2=1073776&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/RemoveHeadersDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/RemoveHeadersDefinition.java Wed Feb 23 15:25:03 2011
@@ -32,7 +32,7 @@ import org.apache.camel.util.ObjectHelpe
*/
@XmlRootElement(name = "removeHeaders")
@XmlAccessorType(XmlAccessType.FIELD)
-public class RemoveHeadersDefinition extends OutputDefinition<RemoveHeadersDefinition> {
+public class RemoveHeadersDefinition extends NoOutputDefinition<RemoveHeadersDefinition> {
@XmlAttribute(required = true)
private String pattern;
@XmlAttribute(required = false)
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/RemovePropertyDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RemovePropertyDefinition.java?rev=1073776&r1=1073775&r2=1073776&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/RemovePropertyDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/RemovePropertyDefinition.java Wed Feb 23 15:25:03 2011
@@ -31,7 +31,7 @@ import org.apache.camel.util.ObjectHelpe
*/
@XmlRootElement(name = "removeProperty")
@XmlAccessorType(XmlAccessType.FIELD)
-public class RemovePropertyDefinition extends OutputDefinition<RemovePropertyDefinition> {
+public class RemovePropertyDefinition extends NoOutputDefinition<RemovePropertyDefinition> {
@XmlAttribute(required = true)
private String propertyName;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java?rev=1073776&r1=1073775&r2=1073776&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java Wed Feb 23 15:25:03 2011
@@ -45,8 +45,6 @@ import org.apache.camel.util.ObjectHelpe
@XmlAccessorType(XmlAccessType.FIELD)
public class ResequenceDefinition extends ProcessorDefinition<ResequenceDefinition> {
- // TODO: extend OutputDefinition, and use propOrder to control the ordering if possible
-
@XmlElement(name = "batch-config", required = false)
private BatchResequencerConfig batchConfig;
@XmlElement(name = "stream-config", required = false)
@@ -64,11 +62,19 @@ public class ResequenceDefinition extend
return "resequence";
}
- @Override
public List<ProcessorDefinition> getOutputs() {
return outputs;
}
+ public void setOutputs(List<ProcessorDefinition> outputs) {
+ this.outputs = outputs;
+ }
+
+ @Override
+ public boolean isOutputSupported() {
+ return true;
+ }
+
// Fluent API
// -------------------------------------------------------------------------
/**
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/RollbackDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RollbackDefinition.java?rev=1073776&r1=1073775&r2=1073776&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/RollbackDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/RollbackDefinition.java Wed Feb 23 15:25:03 2011
@@ -16,8 +16,6 @@
*/
package org.apache.camel.model;
-import java.util.Collections;
-import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
@@ -32,7 +30,7 @@ import org.apache.camel.spi.RouteContext
*/
@XmlRootElement(name = "rollback")
@XmlAccessorType(XmlAccessType.FIELD)
-public class RollbackDefinition extends ProcessorDefinition<RollbackDefinition> {
+public class RollbackDefinition extends NoOutputDefinition<RollbackDefinition> {
@XmlAttribute
private Boolean markRollbackOnly;
@@ -79,12 +77,6 @@ public class RollbackDefinition extends
return answer;
}
- @Override
- @SuppressWarnings("unchecked")
- public List<ProcessorDefinition> getOutputs() {
- return Collections.EMPTY_LIST;
- }
-
public Boolean getMarkRollbackOnly() {
return markRollbackOnly;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java?rev=1073776&r1=1073775&r2=1073776&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java Wed Feb 23 15:25:03 2011
@@ -527,6 +527,10 @@ public class RouteDefinition extends Pro
}
}
+ public boolean isOutputSupported() {
+ return true;
+ }
+
/**
* The group that this route belongs to; could be the name of the RouteBuilder class
* or be explicitly configured in the XML.
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java?rev=1073776&r1=1073775&r2=1073776&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java Wed Feb 23 15:25:03 2011
@@ -38,7 +38,9 @@ import org.apache.camel.spi.RouteContext
public class SamplingDefinition extends OutputDefinition<SamplingDefinition> {
// use Long to let it be optional in JAXB so when using XML the default is 1 second
-
+
+ // TODO: Camel 3.0 Should extend NoOutputDefinition
+
@XmlAttribute
private Long samplePeriod;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/SendDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SendDefinition.java?rev=1073776&r1=1073775&r2=1073776&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/SendDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/SendDefinition.java Wed Feb 23 15:25:03 2011
@@ -16,9 +16,6 @@
*/
package org.apache.camel.model;
-import java.util.Collections;
-import java.util.List;
-
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
@@ -38,7 +35,7 @@ import org.apache.camel.util.ObjectHelpe
* @version
*/
@XmlAccessorType(XmlAccessType.FIELD)
-public abstract class SendDefinition<Type extends ProcessorDefinition<Type>> extends ProcessorDefinition<Type> {
+public abstract class SendDefinition<Type extends ProcessorDefinition<Type>> extends NoOutputDefinition<Type> {
@XmlAttribute(required = false)
protected String uri;
@XmlAttribute(required = false)
@@ -106,10 +103,6 @@ public abstract class SendDefinition<Typ
return null;
}
- public List<ProcessorDefinition> getOutputs() {
- return Collections.emptyList();
- }
-
/**
* Returns the endpoint URI or the name of the reference to it
*/
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetExchangePatternDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetExchangePatternDefinition.java?rev=1073776&r1=1073775&r2=1073776&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetExchangePatternDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetExchangePatternDefinition.java Wed Feb 23 15:25:03 2011
@@ -34,7 +34,7 @@ import org.apache.camel.spi.RouteContext
*/
@XmlRootElement(name = "setExchangePattern")
@XmlAccessorType(XmlAccessType.FIELD)
-public class SetExchangePatternDefinition extends OutputDefinition<SetExchangePatternDefinition> {
+public class SetExchangePatternDefinition extends NoOutputDefinition<SetExchangePatternDefinition> {
@XmlAttribute(required = true)
private ExchangePattern pattern;
@XmlTransient
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetFaultBodyDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetFaultBodyDefinition.java?rev=1073776&r1=1073775&r2=1073776&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetFaultBodyDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetFaultBodyDefinition.java Wed Feb 23 15:25:03 2011
@@ -23,7 +23,6 @@ import javax.xml.bind.annotation.XmlRoot
import org.apache.camel.Expression;
import org.apache.camel.Processor;
import org.apache.camel.builder.ProcessorBuilder;
-import org.apache.camel.processor.SetBodyProcessor;
import org.apache.camel.spi.RouteContext;
/**
@@ -31,7 +30,7 @@ import org.apache.camel.spi.RouteContext
*/
@XmlRootElement(name = "setFaultBody")
@XmlAccessorType(XmlAccessType.FIELD)
-public class SetFaultBodyDefinition extends ExpressionNode {
+public class SetFaultBodyDefinition extends NoOutputExpressionNode {
public SetFaultBodyDefinition() {
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetOutHeaderDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetOutHeaderDefinition.java?rev=1073776&r1=1073775&r2=1073776&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetOutHeaderDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetOutHeaderDefinition.java Wed Feb 23 15:25:03 2011
@@ -34,7 +34,7 @@ import org.apache.camel.util.ObjectHelpe
*/
@XmlRootElement(name = "setOutHeader")
@XmlAccessorType(XmlAccessType.FIELD)
-public class SetOutHeaderDefinition extends ExpressionNode {
+public class SetOutHeaderDefinition extends NoOutputExpressionNode {
@XmlAttribute(required = true)
private String headerName;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/StopDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/StopDefinition.java?rev=1073776&r1=1073775&r2=1073776&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/StopDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/StopDefinition.java Wed Feb 23 15:25:03 2011
@@ -16,8 +16,6 @@
*/
package org.apache.camel.model;
-import java.util.Collections;
-import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
@@ -33,7 +31,7 @@ import org.apache.camel.spi.RouteContext
*/
@XmlRootElement(name = "stop")
@XmlAccessorType(XmlAccessType.FIELD)
-public class StopDefinition extends OutputDefinition<StopDefinition> {
+public class StopDefinition extends NoOutputDefinition<StopDefinition> {
@Override
public String getShortName() {
@@ -55,9 +53,4 @@ public class StopDefinition extends Outp
return "Stop";
}
- @Override
- @SuppressWarnings("unchecked")
- public List<ProcessorDefinition> getOutputs() {
- return Collections.EMPTY_LIST;
- }
}
\ No newline at end of file
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java?rev=1073776&r1=1073775&r2=1073776&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java Wed Feb 23 15:25:03 2011
@@ -46,6 +46,8 @@ import org.apache.camel.util.concurrent.
@XmlAccessorType(XmlAccessType.FIELD)
public class ThreadsDefinition extends OutputDefinition<ThreadsDefinition> implements ExecutorServiceAwareDefinition<ThreadsDefinition> {
+ // TODO: Camel 3.0 Should extend NoOutputDefinition
+
@XmlTransient
private ExecutorService executorService;
@XmlAttribute
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java?rev=1073776&r1=1073775&r2=1073776&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java Wed Feb 23 15:25:03 2011
@@ -37,6 +37,9 @@ import org.apache.camel.util.concurrent.
@XmlRootElement(name = "throttle")
@XmlAccessorType(XmlAccessType.FIELD)
public class ThrottleDefinition extends OutputDefinition<ThrottleDefinition> implements ExecutorServiceAwareDefinition<ThrottleDefinition> {
+
+ // TODO: Camel 3.0 Should extend NoOutputDefinition
+
@XmlTransient
private ExecutorService executorService;
@XmlAttribute
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java?rev=1073776&r1=1073775&r2=1073776&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java Wed Feb 23 15:25:03 2011
@@ -16,8 +16,6 @@
*/
package org.apache.camel.model;
-import java.util.Collections;
-import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
@@ -35,7 +33,7 @@ import org.apache.camel.util.ObjectHelpe
*/
@XmlRootElement(name = "throwException")
@XmlAccessorType(XmlAccessType.FIELD)
-public class ThrowExceptionDefinition extends ProcessorDefinition<ThrowExceptionDefinition> {
+public class ThrowExceptionDefinition extends NoOutputDefinition<ThrowExceptionDefinition> {
@Required
@XmlAttribute(name = "ref", required = true)
// the ref is required from tooling and XML DSL
@@ -66,12 +64,6 @@ public class ThrowExceptionDefinition ex
return new ThrowExceptionProcessor(exception);
}
- @Override
- @SuppressWarnings("unchecked")
- public List<ProcessorDefinition> getOutputs() {
- return Collections.EMPTY_LIST;
- }
-
public Exception getException() {
return exception;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToDefinition.java?rev=1073776&r1=1073775&r2=1073776&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToDefinition.java Wed Feb 23 15:25:03 2011
@@ -16,13 +16,10 @@
*/
package org.apache.camel.model;
-import java.util.ArrayList;
-import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
import org.apache.camel.Endpoint;
import org.apache.camel.ExchangePattern;
@@ -35,8 +32,6 @@ import org.apache.camel.ExchangePattern;
@XmlRootElement(name = "to")
@XmlAccessorType(XmlAccessType.FIELD)
public class ToDefinition extends SendDefinition<ToDefinition> {
- @XmlTransient
- private final List<ProcessorDefinition> outputs = new ArrayList<ProcessorDefinition>();
@XmlAttribute(required = false)
private ExchangePattern pattern;
@@ -62,11 +57,6 @@ public class ToDefinition extends SendDe
}
@Override
- public List<ProcessorDefinition> getOutputs() {
- return outputs;
- }
-
- @Override
public String toString() {
return "To[" + getLabel() + "]";
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransactedDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransactedDefinition.java?rev=1073776&r1=1073775&r2=1073776&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransactedDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransactedDefinition.java Wed Feb 23 15:25:03 2011
@@ -18,7 +18,6 @@ package org.apache.camel.model;
import java.lang.reflect.Method;
import java.util.Map;
-
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/WhenDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/WhenDefinition.java?rev=1073776&r1=1073775&r2=1073776&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/WhenDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/WhenDefinition.java Wed Feb 23 15:25:03 2011
@@ -74,7 +74,9 @@ public class WhenDefinition extends Expr
/**
* Set the expression that WhenType will use
* @return the builder
+ * @deprecated
*/
+ @Deprecated
public ExpressionClause<WhenDefinition> expression() {
return ExpressionClause.createAndSetExpression(this);
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalancerDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalancerDefinition.java?rev=1073776&r1=1073775&r2=1073776&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalancerDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalancerDefinition.java Wed Feb 23 15:25:03 2011
@@ -22,7 +22,6 @@ import org.apache.camel.model.LoadBalanc
import org.apache.camel.processor.loadbalancer.LoadBalancer;
import org.apache.camel.spi.RouteContext;
-
/**
* Represents an XML <random/> element
*/