Author: hadrian
Date: Wed Feb 15 16:57:59 2012
New Revision: 1244591
URL: http://svn.apache.org/viewvc?rev=1244591&view=rev
Log:
CAMEL-4796. One more fix for raw types related to outputs in the model
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/AOPDefinition.java
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/DynamicRouterDefinition.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/InterceptSendToEndpointDefinition.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/NoOutputDefinition.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/OtherwiseDefinition.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/ProcessorDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.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/RouteDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java
camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RandomLoadBalanceJavaDSLBuilderTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterWithCustomThreadPoolExecutorTest.java
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java?rev=1244591&r1=1244590&r2=1244591&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
Wed Feb 15 16:57:59 2012
@@ -593,13 +593,12 @@ public class DefaultManagementLifecycleS
routeContext.setManagedInterceptStrategy(new
InstrumentationInterceptStrategy(registeredCounters, wrappedProcessors));
}
- @SuppressWarnings("rawtypes")
private void registerPerformanceCounters(RouteContext routeContext,
ProcessorDefinition<?> processor,
Map<ProcessorDefinition<?>,
PerformanceCounter> registeredCounters) {
// traverse children if any exists
- List<ProcessorDefinition> children = processor.getOutputs();
- for (ProcessorDefinition child : children) {
+ List<ProcessorDefinition<?>> children = processor.getOutputs();
+ for (ProcessorDefinition<?> child : children) {
registerPerformanceCounters(routeContext, child,
registeredCounters);
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/AOPDefinition.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AOPDefinition.java?rev=1244591&r1=1244590&r2=1244591&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/AOPDefinition.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/AOPDefinition.java
Wed Feb 15 16:57:59 2012
@@ -96,7 +96,7 @@ public class AOPDefinition extends Outpu
// use a pipeline to assemble the before and target processor
// and the after if not afterFinally
- Collection<ProcessorDefinition> pipe = new
ArrayList<ProcessorDefinition>();
+ Collection<ProcessorDefinition<?>> pipe = new
ArrayList<ProcessorDefinition<?>>();
Processor finallyProcessor = null;
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=1244591&r1=1244590&r2=1244591&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 15 16:57:59 2012
@@ -63,7 +63,7 @@ public class AggregateDefinition extends
@XmlTransient
private ExpressionDefinition expression;
@XmlElementRef
- private List<ProcessorDefinition> outputs = new
ArrayList<ProcessorDefinition>();
+ private List<ProcessorDefinition<?>> outputs = new
ArrayList<ProcessorDefinition<?>>();
@XmlTransient
private AggregationStrategy aggregationStrategy;
@XmlTransient
@@ -253,7 +253,7 @@ public class AggregateDefinition extends
}
@Override
- protected void configureChild(ProcessorDefinition output) {
+ protected void configureChild(ProcessorDefinition<?> output) {
if (expression != null && expression instanceof ExpressionClause) {
ExpressionClause<?> clause = (ExpressionClause<?>) expression;
if (clause.getExpressionType() != null) {
@@ -785,7 +785,8 @@ public class AggregateDefinition extends
this.expression = expression;
}
- public List<ProcessorDefinition> getOutputs() {
+ @Override
+ public List<ProcessorDefinition<?>> getOutputs() {
return outputs;
}
@@ -793,7 +794,7 @@ public class AggregateDefinition extends
return true;
}
- public void setOutputs(List<ProcessorDefinition> outputs) {
+ 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=1244591&r1=1244590&r2=1244591&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 15 16:57:59 2012
@@ -50,7 +50,7 @@ public class CatchDefinition extends Pro
@XmlElement(name = "handled")
private ExpressionSubElementDefinition handled;
@XmlElementRef
- private List<ProcessorDefinition> outputs = new
ArrayList<ProcessorDefinition>();
+ private List<ProcessorDefinition<?>> outputs = new
ArrayList<ProcessorDefinition<?>>();
@XmlTransient
private List<Class<? extends Throwable>> exceptionClasses;
@XmlTransient
@@ -111,11 +111,12 @@ public class CatchDefinition extends Pro
return new CatchProcessor(exceptionClasses, childProcessor, when,
handle);
}
- public List<ProcessorDefinition> getOutputs() {
+ @Override
+ public List<ProcessorDefinition<?>> getOutputs() {
return outputs;
}
- public void setOutputs(List<ProcessorDefinition> outputs) {
+ public void setOutputs(List<ProcessorDefinition<?>> outputs) {
this.outputs = outputs;
}
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=1244591&r1=1244590&r2=1244591&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 15 16:57:59 2012
@@ -52,12 +52,12 @@ public class ChoiceDefinition extends Pr
}
@Override
- public List<ProcessorDefinition> getOutputs() {
+ public List<ProcessorDefinition<?>> getOutputs() {
// wrap the outputs into a list where we can on the inside control the
when/otherwise
// but make it appear as a list on the outside
- return new AbstractList<ProcessorDefinition>() {
+ return new AbstractList<ProcessorDefinition<?>>() {
- public ProcessorDefinition get(int index) {
+ public ProcessorDefinition<?> get(int index) {
if (index < whenClauses.size()) {
return whenClauses.get(index);
}
@@ -67,7 +67,7 @@ public class ChoiceDefinition extends Pr
throw new IndexOutOfBoundsException("Index " + index + " is
out of bounds with size " + size());
}
- public boolean add(ProcessorDefinition def) {
+ public boolean add(ProcessorDefinition<?> def) {
if (def instanceof WhenDefinition) {
return whenClauses.add((WhenDefinition)def);
} else if (def instanceof OtherwiseDefinition) {
@@ -87,7 +87,7 @@ public class ChoiceDefinition extends Pr
otherwise = null;
}
- public ProcessorDefinition set(int index, ProcessorDefinition
element) {
+ public ProcessorDefinition<?> set(int index,
ProcessorDefinition<?> element) {
if (index < whenClauses.size()) {
if (element instanceof WhenDefinition) {
return whenClauses.set(index, (WhenDefinition)element);
@@ -95,18 +95,18 @@ public class ChoiceDefinition extends Pr
throw new IllegalArgumentException("Expected
WhenDefinition but was "
+ ObjectHelper.classCanonicalName(element));
} else if (index == whenClauses.size()) {
- ProcessorDefinition old = otherwise;
+ ProcessorDefinition<?> old = otherwise;
otherwise = (OtherwiseDefinition)element;
return old;
}
throw new IndexOutOfBoundsException("Index " + index + " is
out of bounds with size " + size());
}
- public ProcessorDefinition remove(int index) {
+ public ProcessorDefinition<?> remove(int index) {
if (index < whenClauses.size()) {
return whenClauses.remove(index);
} else if (index == whenClauses.size()) {
- ProcessorDefinition old = otherwise;
+ ProcessorDefinition<?> old = otherwise;
otherwise = null;
return old;
}
@@ -168,7 +168,7 @@ public class ChoiceDefinition extends Pr
return clause;
}
- private void addClause(ProcessorDefinition when) {
+ private void addClause(ProcessorDefinition<?> when) {
popBlock();
addOutput(when);
pushBlock(when);
@@ -229,7 +229,7 @@ public class ChoiceDefinition extends Pr
}
@Override
- protected void configureChild(ProcessorDefinition output) {
+ protected void configureChild(ProcessorDefinition<?> output) {
if (whenClauses == null || whenClauses.isEmpty()) {
return;
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/DynamicRouterDefinition.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/DynamicRouterDefinition.java?rev=1244591&r1=1244590&r2=1244591&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/DynamicRouterDefinition.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/DynamicRouterDefinition.java
Wed Feb 15 16:57:59 2012
@@ -65,7 +65,7 @@ public class DynamicRouterDefinition<Typ
}
@Override
- public List<ProcessorDefinition> getOutputs() {
+ public List<ProcessorDefinition<?>> getOutputs() {
return Collections.emptyList();
}
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=1244591&r1=1244590&r2=1244591&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 15 16:57:59 2012
@@ -41,7 +41,7 @@ public class ExpressionNode extends Proc
@XmlElementRef
private ExpressionDefinition expression;
@XmlElementRef
- private List<ProcessorDefinition> outputs = new
ArrayList<ProcessorDefinition>();
+ private List<ProcessorDefinition<?>> outputs = new
ArrayList<ProcessorDefinition<?>>();
public ExpressionNode() {
}
@@ -76,11 +76,12 @@ public class ExpressionNode extends Proc
this.expression = expression;
}
- public List<ProcessorDefinition> getOutputs() {
+ @Override
+ public List<ProcessorDefinition<?>> getOutputs() {
return outputs;
}
- public void setOutputs(List<ProcessorDefinition> outputs) {
+ public void setOutputs(List<ProcessorDefinition<?>> outputs) {
this.outputs = outputs;
}
@@ -120,7 +121,7 @@ public class ExpressionNode extends Proc
}
@Override
- protected void configureChild(ProcessorDefinition output) {
+ protected void configureChild(ProcessorDefinition<?> output) {
// reuse the logic from pre create processor
preCreateProcessor();
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java?rev=1244591&r1=1244590&r2=1244591&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java
Wed Feb 15 16:57:59 2012
@@ -109,7 +109,7 @@ public class InterceptSendToEndpointDefi
// instead we use the proxy endpoints producer do the triggering. That
is we trigger when someone sends
// an exchange to the endpoint, see InterceptSendToEndpoint for
details.
RouteDefinition route = routeContext.getRoute();
- List<ProcessorDefinition> outputs = route.getOutputs();
+ List<ProcessorDefinition<?>> outputs = route.getOutputs();
outputs.remove(this);
return new InterceptEndpointProcessor(uri, detour);
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=1244591&r1=1244590&r2=1244591&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 15 16:57:59 2012
@@ -70,7 +70,7 @@ public class LoadBalanceDefinition exten
)
private LoadBalancerDefinition loadBalancerType;
@XmlElementRef
- private List<ProcessorDefinition> outputs = new
ArrayList<ProcessorDefinition>();
+ private List<ProcessorDefinition<?>> outputs = new
ArrayList<ProcessorDefinition<?>>();
public LoadBalanceDefinition() {
}
@@ -80,11 +80,12 @@ public class LoadBalanceDefinition exten
return "loadbalance";
}
- public List<ProcessorDefinition> getOutputs() {
+ @Override
+ public List<ProcessorDefinition<?>> getOutputs() {
return outputs;
}
- public void setOutputs(List<ProcessorDefinition> outputs) {
+ public void setOutputs(List<ProcessorDefinition<?>> outputs) {
this.outputs = outputs;
if (outputs != null) {
for (ProcessorDefinition<?> output : outputs) {
@@ -117,7 +118,8 @@ public class LoadBalanceDefinition exten
}
protected Processor createOutputsProcessor(RouteContext routeContext,
- Collection<ProcessorDefinition>
outputs) throws Exception {
+ Collection<ProcessorDefinition<?>> outputs) throws Exception {
+
LoadBalancer loadBalancer =
LoadBalancerDefinition.getLoadBalancer(routeContext, loadBalancerType, ref);
for (ProcessorDefinition<?> processorType : outputs) {
Processor processor = processorType.createProcessor(routeContext);
@@ -295,8 +297,8 @@ public class LoadBalanceDefinition exten
@Override
public String getLabel() {
CollectionStringBuffer buffer = new
CollectionStringBuffer("loadBalance[");
- List<ProcessorDefinition> list = getOutputs();
- for (ProcessorDefinition processorType : list) {
+ List<ProcessorDefinition<?>> list = getOutputs();
+ for (ProcessorDefinition<?> processorType : list) {
buffer.append(processorType.getLabel());
}
buffer.append("]");
Modified:
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=1244591&r1=1244590&r2=1244591&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/NoOutputDefinition.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/NoOutputDefinition.java
Wed Feb 15 16:57:59 2012
@@ -24,7 +24,7 @@ import java.util.List;
*/
public abstract class NoOutputDefinition<Type extends
ProcessorDefinition<Type>> extends ProcessorDefinition<Type> {
- public List<ProcessorDefinition> getOutputs() {
+ public List<ProcessorDefinition<?>> getOutputs() {
return Collections.emptyList();
}
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=1244591&r1=1244590&r2=1244591&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 15 16:57:59 2012
@@ -52,8 +52,7 @@ public class NoOutputExpressionNode exte
}
@Override
- @SuppressWarnings("rawtypes")
- public List<ProcessorDefinition> getOutputs() {
+ public List<ProcessorDefinition<?>> getOutputs() {
return Collections.emptyList();
}
@@ -63,7 +62,7 @@ public class NoOutputExpressionNode exte
}
@Override
- public void addOutput(ProcessorDefinition output) {
+ 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=1244591&r1=1244590&r2=1244591&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 15 16:57:59 2012
@@ -58,7 +58,7 @@ public class OnCompletionDefinition exte
@XmlAttribute(name = "useOriginalMessage")
private Boolean useOriginalMessagePolicy;
@XmlElementRef
- private List<ProcessorDefinition> outputs = new
ArrayList<ProcessorDefinition>();
+ private List<ProcessorDefinition<?>> outputs = new
ArrayList<ProcessorDefinition<?>>();
@XmlTransient
private ExecutorService executorService;
@XmlTransient
@@ -149,10 +149,9 @@ public class OnCompletionDefinition exte
*
* @param definition the parent definition that is the route
*/
- @SuppressWarnings("unchecked")
- public void removeAllOnCompletionDefinition(ProcessorDefinition
definition) {
- for (Iterator<ProcessorDefinition> it =
definition.getOutputs().iterator(); it.hasNext();) {
- ProcessorDefinition out = it.next();
+ public void removeAllOnCompletionDefinition(ProcessorDefinition<?>
definition) {
+ for (Iterator<ProcessorDefinition<?>> it =
definition.getOutputs().iterator(); it.hasNext();) {
+ ProcessorDefinition<?> out = it.next();
if (out instanceof OnCompletionDefinition) {
it.remove();
}
@@ -233,11 +232,11 @@ public class OnCompletionDefinition exte
return this;
}
- public List<ProcessorDefinition> getOutputs() {
+ public List<ProcessorDefinition<?>> getOutputs() {
return outputs;
}
- public void setOutputs(List<ProcessorDefinition> outputs) {
+ public void setOutputs(List<ProcessorDefinition<?>> outputs) {
this.outputs = outputs;
}
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=1244591&r1=1244590&r2=1244591&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 15 16:57:59 2012
@@ -73,7 +73,7 @@ public class OnExceptionDefinition exten
@XmlAttribute(name = "useOriginalMessage")
private Boolean useOriginalMessagePolicy;
@XmlElementRef
- private List<ProcessorDefinition> outputs = new
ArrayList<ProcessorDefinition>();
+ private List<ProcessorDefinition<?>> outputs = new
ArrayList<ProcessorDefinition<?>>();
@XmlTransient
private List<Class<? extends Throwable>> exceptionClasses;
@XmlTransient
@@ -721,12 +721,12 @@ public class OnExceptionDefinition exten
// Properties
//-------------------------------------------------------------------------
-
- public List<ProcessorDefinition> getOutputs() {
+ @Override
+ public List<ProcessorDefinition<?>> getOutputs() {
return outputs;
}
- public void setOutputs(List<ProcessorDefinition> outputs) {
+ public void setOutputs(List<ProcessorDefinition<?>> outputs) {
this.outputs = outputs;
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OtherwiseDefinition.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OtherwiseDefinition.java?rev=1244591&r1=1244590&r2=1244591&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OtherwiseDefinition.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OtherwiseDefinition.java
Wed Feb 15 16:57:59 2012
@@ -55,8 +55,8 @@ public class OtherwiseDefinition extends
@Override
public String getLabel() {
CollectionStringBuffer buffer = new
CollectionStringBuffer("otherwise[");
- List<ProcessorDefinition> list = getOutputs();
- for (ProcessorDefinition type : list) {
+ List<ProcessorDefinition<?>> list = getOutputs();
+ for (ProcessorDefinition<?> type : list) {
buffer.append(type.getLabel());
}
buffer.append("]");
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=1244591&r1=1244590&r2=1244591&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 15 16:57:59 2012
@@ -32,9 +32,9 @@ import javax.xml.bind.annotation.XmlType
@XmlAccessorType(XmlAccessType.FIELD)
public class OutputDefinition<Type extends ProcessorDefinition<Type>> extends
ProcessorDefinition<Type> {
@XmlElementRef
- protected List<ProcessorDefinition> outputs = new
ArrayList<ProcessorDefinition>();
+ protected List<ProcessorDefinition<?>> outputs = new
ArrayList<ProcessorDefinition<?>>();
- public List<ProcessorDefinition> getOutputs() {
+ public List<ProcessorDefinition<?>> getOutputs() {
return outputs;
}
@@ -42,7 +42,7 @@ public class OutputDefinition<Type exten
return true;
}
- public void setOutputs(List<ProcessorDefinition> outputs) {
+ public void setOutputs(List<ProcessorDefinition<?>> outputs) {
this.outputs = outputs;
if (outputs != null) {
for (ProcessorDefinition<?> output : outputs) {
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=1244591&r1=1244590&r2=1244591&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 15 16:57:59 2012
@@ -89,7 +89,7 @@ public abstract class ProcessorDefinitio
private Map<QName, Object> otherAttributes;
// else to use an optional attribute in JAXB2
- public abstract List<ProcessorDefinition> getOutputs();
+ public abstract List<ProcessorDefinition<?>> getOutputs();
public abstract boolean isOutputSupported();
@@ -126,7 +126,7 @@ public abstract class ProcessorDefinitio
* Prefer to use {#link #createChildProcessor}.
*/
public Processor createOutputsProcessor(RouteContext routeContext) throws
Exception {
- Collection<ProcessorDefinition> outputs = getOutputs();
+ Collection<ProcessorDefinition<?>> outputs = getOutputs();
return createOutputsProcessor(routeContext, outputs);
}
@@ -155,7 +155,7 @@ public abstract class ProcessorDefinitio
return children;
}
- public void addOutput(ProcessorDefinition output) {
+ public void addOutput(ProcessorDefinition<?> output) {
if (!blocks.isEmpty()) {
// let the Block deal with the output
Block block = blocks.getLast();
@@ -364,7 +364,7 @@ public abstract class ProcessorDefinitio
return new DefaultChannel();
}
- protected Processor createOutputsProcessor(RouteContext routeContext,
Collection<ProcessorDefinition> outputs) throws Exception {
+ protected Processor createOutputsProcessor(RouteContext routeContext,
Collection<ProcessorDefinition<?>> outputs) throws Exception {
List<Processor> list = new ArrayList<Processor>();
for (ProcessorDefinition<?> output : outputs) {
@@ -972,7 +972,7 @@ public abstract class ProcessorDefinitio
// set it on last output as this is what the user means to do
// for Block(s) with non empty getOutputs() the id probably refers
// to the last definition in the current Block
- List<ProcessorDefinition> outputs = getOutputs();
+ List<ProcessorDefinition<?>> outputs = getOutputs();
if (!blocks.isEmpty()) {
if (blocks.getLast() instanceof ProcessorDefinition) {
ProcessorDefinition<?> block =
(ProcessorDefinition<?>)blocks.getLast();
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java?rev=1244591&r1=1244590&r2=1244591&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java
Wed Feb 15 16:57:59 2012
@@ -43,8 +43,7 @@ public final class ProcessorDefinitionHe
* @param type the type to look for
* @return the found definitions, or <tt>null</tt> if not found
*/
- @SuppressWarnings("rawtypes")
- public static <T> Iterator<T>
filterTypeInOutputs(List<ProcessorDefinition> outputs, Class<T> type) {
+ public static <T> Iterator<T>
filterTypeInOutputs(List<ProcessorDefinition<?>> outputs, Class<T> type) {
List<T> found = new ArrayList<T>();
doFindType(outputs, type, found);
return found.iterator();
@@ -58,8 +57,7 @@ public final class ProcessorDefinitionHe
* @param type the type to look for
* @return the first found type, or <tt>null</tt> if not found
*/
- @SuppressWarnings("rawtypes")
- public static <T> T findFirstTypeInOutputs(List<ProcessorDefinition>
outputs, Class<T> type) {
+ public static <T> T findFirstTypeInOutputs(List<ProcessorDefinition<?>>
outputs, Class<T> type) {
List<T> found = new ArrayList<T>();
doFindType(outputs, type, found);
if (found.isEmpty()) {
@@ -141,7 +139,7 @@ public final class ProcessorDefinitionHe
}
@SuppressWarnings({"unchecked", "rawtypes"})
- private static <T> void doFindType(List<ProcessorDefinition> outputs,
Class<T> type, List<T> found) {
+ private static <T> void doFindType(List<ProcessorDefinition<?>> outputs,
Class<T> type, List<T> found) {
if (outputs == null || outputs.isEmpty()) {
return;
}
@@ -154,7 +152,7 @@ public final class ProcessorDefinitionHe
// send is much common
if (out instanceof SendDefinition) {
SendDefinition send = (SendDefinition) out;
- List<ProcessorDefinition> children = send.getOutputs();
+ List<ProcessorDefinition<?>> children = send.getOutputs();
doFindType(children, type, found);
}
@@ -162,19 +160,19 @@ public final class ProcessorDefinitionHe
if (out instanceof ChoiceDefinition) {
ChoiceDefinition choice = (ChoiceDefinition) out;
for (WhenDefinition when : choice.getWhenClauses()) {
- List<ProcessorDefinition> children = when.getOutputs();
+ List<ProcessorDefinition<?>> children = when.getOutputs();
doFindType(children, type, found);
}
// otherwise is optional
if (choice.getOtherwise() != null) {
- List<ProcessorDefinition> children =
choice.getOtherwise().getOutputs();
+ List<ProcessorDefinition<?>> children =
choice.getOtherwise().getOutputs();
doFindType(children, type, found);
}
}
// try children as well
- List<ProcessorDefinition> children = out.getOutputs();
+ List<ProcessorDefinition<?>> children = out.getOutputs();
doFindType(children, type, found);
}
}
@@ -189,7 +187,7 @@ public final class ProcessorDefinitionHe
* @return <tt>true</tt> if has outputs, otherwise <tt>false</tt> is
returned
*/
@SuppressWarnings({"unchecked", "rawtypes"})
- public static boolean hasOutputs(List<ProcessorDefinition> outputs,
boolean excludeAbstract) {
+ public static boolean hasOutputs(List<ProcessorDefinition<?>> outputs,
boolean excludeAbstract) {
if (outputs == null || outputs.isEmpty()) {
return false;
}
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=1244591&r1=1244590&r2=1244591&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 15 16:57:59 2012
@@ -60,7 +60,7 @@ public class ResequenceDefinition extend
@Required
private ExpressionDefinition expression;
@XmlElementRef
- private List<ProcessorDefinition> outputs = new
ArrayList<ProcessorDefinition>();
+ private List<ProcessorDefinition<?>> outputs = new
ArrayList<ProcessorDefinition<?>>();
public ResequenceDefinition() {
}
@@ -70,11 +70,11 @@ public class ResequenceDefinition extend
return "resequence";
}
- public List<ProcessorDefinition> getOutputs() {
+ public List<ProcessorDefinition<?>> getOutputs() {
return outputs;
}
- public void setOutputs(List<ProcessorDefinition> outputs) {
+ public void setOutputs(List<ProcessorDefinition<?>> outputs) {
this.outputs = outputs;
}
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=1244591&r1=1244590&r2=1244591&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 15 16:57:59 2012
@@ -63,7 +63,7 @@ import org.apache.camel.util.ObjectHelpe
public class RouteDefinition extends ProcessorDefinition<RouteDefinition> {
private final AtomicBoolean prepared = new AtomicBoolean(false);
private List<FromDefinition> inputs = new ArrayList<FromDefinition>();
- private List<ProcessorDefinition> outputs = new
ArrayList<ProcessorDefinition>();
+ private List<ProcessorDefinition<?>> outputs = new
ArrayList<ProcessorDefinition<?>>();
private String group;
private String streamCache;
private String trace;
@@ -548,16 +548,16 @@ public class RouteDefinition extends Pro
this.inputs = inputs;
}
- public List<ProcessorDefinition> getOutputs() {
+ public List<ProcessorDefinition<?>> getOutputs() {
return outputs;
}
@XmlElementRef
- public void setOutputs(List<ProcessorDefinition> outputs) {
+ public void setOutputs(List<ProcessorDefinition<?>> outputs) {
this.outputs = outputs;
if (outputs != null) {
- for (ProcessorDefinition output : outputs) {
+ for (ProcessorDefinition<?> output : outputs) {
configureChild(output);
}
}
@@ -733,7 +733,6 @@ public class RouteDefinition extends Pro
// Implementation methods
//
-------------------------------------------------------------------------
- @SuppressWarnings("unchecked")
protected RouteContext addRoutes(CamelContext camelContext,
Collection<Route> routes, FromDefinition fromType) throws Exception {
RouteContext routeContext = new DefaultRouteContext(camelContext,
this, fromType, routes);
@@ -846,8 +845,8 @@ public class RouteDefinition extends Pro
throw new FailedToCreateRouteException(route.getId(),
route.toString(), at, cause);
}
- List<ProcessorDefinition> list = new
ArrayList<ProcessorDefinition>(outputs);
- for (ProcessorDefinition output : list) {
+ List<ProcessorDefinition<?>> list = new
ArrayList<ProcessorDefinition<?>>(outputs);
+ for (ProcessorDefinition<?> output : list) {
try {
output.addRoutes(routeContext, routes);
} catch (Exception e) {
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java?rev=1244591&r1=1244590&r2=1244591&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java
Wed Feb 15 16:57:59 2012
@@ -58,8 +58,8 @@ public final class RouteDefinitionHelper
}
}
- public static void prepareRouteForInit(RouteDefinition route,
List<ProcessorDefinition> abstracts,
- List<ProcessorDefinition> lower) {
+ public static void prepareRouteForInit(RouteDefinition route,
List<ProcessorDefinition<?>> abstracts,
+ List<ProcessorDefinition<?>> lower)
{
// filter the route into abstracts and lower
for (ProcessorDefinition output : route.getOutputs()) {
if (output.isAbstract()) {
@@ -103,13 +103,13 @@ public final class RouteDefinitionHelper
List<OnCompletionDefinition>
onCompletions) {
// abstracts is the cross cutting concerns
- List<ProcessorDefinition> abstracts = new
ArrayList<ProcessorDefinition>();
+ List<ProcessorDefinition<?>> abstracts = new
ArrayList<ProcessorDefinition<?>>();
// upper is the cross cutting concerns such as interceptors, error
handlers etc
- List<ProcessorDefinition> upper = new ArrayList<ProcessorDefinition>();
+ List<ProcessorDefinition<?>> upper = new
ArrayList<ProcessorDefinition<?>>();
// lower is the regular route
- List<ProcessorDefinition> lower = new ArrayList<ProcessorDefinition>();
+ List<ProcessorDefinition<?>> lower = new
ArrayList<ProcessorDefinition<?>>();
RouteDefinitionHelper.prepareRouteForInit(route, abstracts, lower);
@@ -157,7 +157,7 @@ public final class RouteDefinitionHelper
}
private static void initParentAndErrorHandlerBuilder(ModelCamelContext
context, RouteDefinition route,
-
List<ProcessorDefinition> abstracts, List<OnExceptionDefinition> onExceptions) {
+
List<ProcessorDefinition<?>> abstracts, List<OnExceptionDefinition>
onExceptions) {
if (context != null) {
// let the route inherit the error handler builder from camel
context if none already set
@@ -176,7 +176,7 @@ public final class RouteDefinitionHelper
}
}
- private static void initOnExceptions(List<ProcessorDefinition> abstracts,
List<ProcessorDefinition> upper,
+ private static void initOnExceptions(List<ProcessorDefinition<?>>
abstracts, List<ProcessorDefinition<?>> upper,
List<OnExceptionDefinition>
onExceptions) {
// add global on exceptions if any
if (onExceptions != null && !onExceptions.isEmpty()) {
@@ -207,7 +207,7 @@ public final class RouteDefinitionHelper
}
private static void initInterceptors(CamelContext context, RouteDefinition
route,
- List<ProcessorDefinition> abstracts,
List<ProcessorDefinition> upper,
+ List<ProcessorDefinition<?>>
abstracts, List<ProcessorDefinition<?>> upper,
List<InterceptDefinition> intercepts,
List<InterceptFromDefinition>
interceptFromDefinitions,
List<InterceptSendToEndpointDefinition> interceptSendToEndpointDefinitions) {
@@ -235,7 +235,7 @@ public final class RouteDefinitionHelper
doInitInterceptors(context, route, upper, intercepts,
interceptFromDefinitions, interceptSendToEndpointDefinitions);
}
- private static void doInitInterceptors(CamelContext context,
RouteDefinition route, List<ProcessorDefinition> upper,
+ private static void doInitInterceptors(CamelContext context,
RouteDefinition route, List<ProcessorDefinition<?>> upper,
List<InterceptDefinition>
intercepts,
List<InterceptFromDefinition>
interceptFromDefinitions,
List<InterceptSendToEndpointDefinition> interceptSendToEndpointDefinitions) {
@@ -301,7 +301,7 @@ public final class RouteDefinitionHelper
}
}
- private static void initOnCompletions(List<ProcessorDefinition> abstracts,
List<ProcessorDefinition> upper,
+ private static void initOnCompletions(List<ProcessorDefinition<?>>
abstracts, List<ProcessorDefinition<?>> upper,
List<OnCompletionDefinition>
onCompletions) {
List<OnCompletionDefinition> completions = new
ArrayList<OnCompletionDefinition>();
@@ -329,11 +329,11 @@ public final class RouteDefinitionHelper
upper.addAll(completions);
}
- private static void initTransacted(List<ProcessorDefinition> abstracts,
List<ProcessorDefinition> lower) {
+ private static void initTransacted(List<ProcessorDefinition<?>> abstracts,
List<ProcessorDefinition<?>> lower) {
TransactedDefinition transacted = null;
// add to correct type
- for (ProcessorDefinition type : abstracts) {
+ for (ProcessorDefinition<?> type : abstracts) {
if (type instanceof TransactedDefinition) {
if (transacted == null) {
transacted = (TransactedDefinition) type;
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java?rev=1244591&r1=1244590&r2=1244591&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java
Wed Feb 15 16:57:59 2012
@@ -93,7 +93,7 @@ public class RoutingSlipDefinition<Type
}
@Override
- public List<ProcessorDefinition> getOutputs() {
+ public List<ProcessorDefinition<?>> getOutputs() {
return Collections.emptyList();
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java?rev=1244591&r1=1244590&r2=1244591&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java
Wed Feb 15 16:57:59 2012
@@ -50,7 +50,7 @@ public class TryDefinition extends Outpu
@XmlTransient
private boolean initialized;
@XmlTransient
- private List<ProcessorDefinition> outputsWithoutCatches;
+ private List<ProcessorDefinition<?>> outputsWithoutCatches;
public TryDefinition() {
}
@@ -223,20 +223,20 @@ public class TryDefinition extends Outpu
return finallyClause;
}
- public List<ProcessorDefinition> getOutputsWithoutCatches() {
+ public List<ProcessorDefinition<?>> getOutputsWithoutCatches() {
if (outputsWithoutCatches == null) {
checkInitialized();
}
return outputsWithoutCatches;
}
- public void setOutputs(List<ProcessorDefinition> outputs) {
+ public void setOutputs(List<ProcessorDefinition<?>> outputs) {
initialized = false;
super.setOutputs(outputs);
}
@Override
- public void addOutput(ProcessorDefinition output) {
+ public void addOutput(ProcessorDefinition<?> output) {
initialized = false;
super.addOutput(output);
}
@@ -247,11 +247,11 @@ public class TryDefinition extends Outpu
protected void checkInitialized() {
if (!initialized) {
initialized = true;
- outputsWithoutCatches = new ArrayList<ProcessorDefinition>();
+ outputsWithoutCatches = new ArrayList<ProcessorDefinition<?>>();
catchClauses = new ArrayList<CatchDefinition>();
finallyClause = null;
- for (ProcessorDefinition output : outputs) {
+ for (ProcessorDefinition<?> output : outputs) {
if (output instanceof CatchDefinition) {
catchClauses.add((CatchDefinition)output);
} else if (output instanceof FinallyDefinition) {
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java?rev=1244591&r1=1244590&r2=1244591&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java
Wed Feb 15 16:57:59 2012
@@ -356,18 +356,16 @@ public class XmlParseTest extends XmlTes
assertEquals(text, uri, value.getUri());
}
- @SuppressWarnings("rawtypes")
protected void assertChildTo(ProcessorDefinition<?> route, String... uris)
{
- List<ProcessorDefinition> list = assertListSize(route.getOutputs(),
uris.length);
+ List<ProcessorDefinition<?>> list = assertListSize(route.getOutputs(),
uris.length);
int idx = 0;
for (String uri : uris) {
assertTo("output[" + idx + "] ", list.get(idx++), uri);
}
}
- @SuppressWarnings("rawtypes")
protected void assertChildTo(ProcessorDefinition<?> route, String uri, int
toIdx) {
- List<ProcessorDefinition> list = route.getOutputs();
+ List<ProcessorDefinition<?>> list = route.getOutputs();
assertTo("to and idx=" + toIdx, list.get(toIdx), uri);
}
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RandomLoadBalanceJavaDSLBuilderTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RandomLoadBalanceJavaDSLBuilderTest.java?rev=1244591&r1=1244590&r2=1244591&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RandomLoadBalanceJavaDSLBuilderTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RandomLoadBalanceJavaDSLBuilderTest.java
Wed Feb 15 16:57:59 2012
@@ -109,8 +109,7 @@ public class RandomLoadBalanceJavaDSLBui
sb.append(".to(\"" + send.getUri() + "\")");
}
- @SuppressWarnings("rawtypes")
- List<ProcessorDefinition> children = defn.getOutputs();
+ List<ProcessorDefinition<?>> children = defn.getOutputs();
if (children == null || children.isEmpty()) {
return;
}
@@ -119,5 +118,4 @@ public class RandomLoadBalanceJavaDSLBui
navigateDefinition(child, sb);
}
}
-
}
\ No newline at end of file
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterWithCustomThreadPoolExecutorTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterWithCustomThreadPoolExecutorTest.java?rev=1244591&r1=1244590&r2=1244591&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterWithCustomThreadPoolExecutorTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterWithCustomThreadPoolExecutorTest.java
Wed Feb 15 16:57:59 2012
@@ -57,11 +57,10 @@ public class SplitterWithCustomThreadPoo
return result;
}
- @SuppressWarnings({"unchecked", "rawtypes"})
- protected SplitDefinition firstSplitterType(List<ProcessorDefinition>
outputs) {
+ protected SplitDefinition firstSplitterType(List<ProcessorDefinition<?>>
outputs) {
SplitDefinition result = null;
- for (ProcessorDefinition processorType : outputs) {
+ for (ProcessorDefinition<?> processorType : outputs) {
if (processorType instanceof SplitDefinition) {
result = (SplitDefinition) processorType;
} else {
Modified:
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java?rev=1244591&r1=1244590&r2=1244591&view=diff
==============================================================================
---
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
(original)
+++
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
Wed Feb 15 16:57:59 2012
@@ -759,10 +759,10 @@ public class CamelNamespaceHandler imple
}
}
- @SuppressWarnings({"unchecked", "rawtypes"})
- private void findOutputComponents(List<ProcessorDefinition> defs,
Set<String> components, Set<String> languages, Set<String> dataformats) {
+ @SuppressWarnings({"rawtypes"})
+ private void findOutputComponents(List<ProcessorDefinition<?>> defs,
Set<String> components, Set<String> languages, Set<String> dataformats) {
if (defs != null) {
- for (ProcessorDefinition def : defs) {
+ for (ProcessorDefinition<?> def : defs) {
if (def instanceof SendDefinition) {
findUriComponent(((SendDefinition) def).getUri(),
components);
}