You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2012/02/15 23:33:13 UTC
svn commit: r1244769 - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/builder/
camel-core/src/main/java/org/apache/camel/model/
camel-core/src/main/java/org/apache/camel/view/
components/camel-bam/src/main/java/org/apache/camel/bam/rules/
Author: bvahdat
Date: Wed Feb 15 22:33:13 2012
New Revision: 1244769
URL: http://svn.apache.org/viewvc?rev=1244769&view=rev
Log:
Resolved the rest of all remaining compiler warnings concerning the rawtype referenced generic types. As the side effect removed a bunch of SuppressWarnings usages as well.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExecutorServiceAwareDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.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/ProcessorDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.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/ThreadPoolProfileDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/WireTapDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/view/NodeData.java
camel/trunk/camel-core/src/main/java/org/apache/camel/view/RouteDotGenerator.java
camel/trunk/camel-core/src/main/java/org/apache/camel/view/XmlGraphGenerator.java
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/TemporalRule.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java?rev=1244769&r1=1244768&r2=1244769&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java Wed Feb 15 22:33:13 2012
@@ -23,7 +23,7 @@ import org.apache.camel.model.RouteDefin
/**
* A builder when using the <a href="http://camel.apache.org/advicewith.html">advice with</a> feature.
*/
-public class AdviceWithBuilder<T extends ProcessorDefinition> {
+public class AdviceWithBuilder<T extends ProcessorDefinition<?>> {
private final AdviceWithRouteBuilder builder;
private final String id;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java?rev=1244769&r1=1244768&r2=1244769&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java Wed Feb 15 22:33:13 2012
@@ -110,37 +110,36 @@ public final class AdviceWithTasks {
}
}
- public static AdviceWithTask replaceByToString(final RouteDefinition route, final String toString, final ProcessorDefinition replace,
+ public static AdviceWithTask replaceByToString(final RouteDefinition route, final String toString, final ProcessorDefinition<?> replace,
boolean selectFirst, boolean selectLast, int selectFrom, int selectTo) {
MatchBy matchBy = new MatchByToString(toString);
- Iterator<ProcessorDefinition> it = AdviceWithTasks.createMatchByIterator(route, matchBy, selectFirst, selectLast, selectFrom, selectTo);
+ Iterator<ProcessorDefinition<?>> it = AdviceWithTasks.createMatchByIterator(route, matchBy, selectFirst, selectLast, selectFrom, selectTo);
return doReplace(route, new MatchByToString(toString), replace, it);
}
- public static AdviceWithTask replaceById(final RouteDefinition route, final String id, final ProcessorDefinition replace,
+ public static AdviceWithTask replaceById(final RouteDefinition route, final String id, final ProcessorDefinition<?> replace,
boolean selectFirst, boolean selectLast, int selectFrom, int selectTo) {
MatchBy matchBy = new MatchById(id);
- Iterator<ProcessorDefinition> it = AdviceWithTasks.createMatchByIterator(route, matchBy, selectFirst, selectLast, selectFrom, selectTo);
+ Iterator<ProcessorDefinition<?>> it = AdviceWithTasks.createMatchByIterator(route, matchBy, selectFirst, selectLast, selectFrom, selectTo);
return doReplace(route, matchBy, replace, it);
}
- public static AdviceWithTask replaceByType(final RouteDefinition route, final Class<?> type, final ProcessorDefinition replace,
+ public static AdviceWithTask replaceByType(final RouteDefinition route, final Class<?> type, final ProcessorDefinition<?> replace,
boolean selectFirst, boolean selectLast, int selectFrom, int selectTo) {
MatchBy matchBy = new MatchByType(type);
- Iterator<ProcessorDefinition> it = AdviceWithTasks.createMatchByIterator(route, matchBy, selectFirst, selectLast, selectFrom, selectTo);
+ Iterator<ProcessorDefinition<?>> it = AdviceWithTasks.createMatchByIterator(route, matchBy, selectFirst, selectLast, selectFrom, selectTo);
return doReplace(route, matchBy, replace, it);
}
- @SuppressWarnings("unchecked")
- private static AdviceWithTask doReplace(final RouteDefinition route, final MatchBy matchBy, final ProcessorDefinition replace,
- final Iterator<ProcessorDefinition> it) {
+ private static AdviceWithTask doReplace(final RouteDefinition route, final MatchBy matchBy, final ProcessorDefinition<?> replace,
+ final Iterator<ProcessorDefinition<?>> it) {
return new AdviceWithTask() {
public void task() throws Exception {
boolean match = false;
while (it.hasNext()) {
- ProcessorDefinition output = it.next();
+ ProcessorDefinition<?> output = it.next();
if (matchBy.match(output)) {
- ProcessorDefinition parent = output.getParent();
+ ProcessorDefinition<?> parent = output.getParent();
if (parent != null) {
int index = parent.getOutputs().indexOf(output);
if (index != -1) {
@@ -163,33 +162,33 @@ public final class AdviceWithTasks {
public static AdviceWithTask removeByToString(final RouteDefinition route, final String toString,
boolean selectFirst, boolean selectLast, int selectFrom, int selectTo) {
MatchBy matchBy = new MatchByToString(toString);
- Iterator<ProcessorDefinition> it = AdviceWithTasks.createMatchByIterator(route, matchBy, selectFirst, selectLast, selectFrom, selectTo);
+ Iterator<ProcessorDefinition<?>> it = AdviceWithTasks.createMatchByIterator(route, matchBy, selectFirst, selectLast, selectFrom, selectTo);
return doRemove(route, matchBy, it);
}
public static AdviceWithTask removeById(final RouteDefinition route, final String id,
boolean selectFirst, boolean selectLast, int selectFrom, int selectTo) {
MatchBy matchBy = new MatchById(id);
- Iterator<ProcessorDefinition> it = AdviceWithTasks.createMatchByIterator(route, matchBy, selectFirst, selectLast, selectFrom, selectTo);
+ Iterator<ProcessorDefinition<?>> it = AdviceWithTasks.createMatchByIterator(route, matchBy, selectFirst, selectLast, selectFrom, selectTo);
return doRemove(route, matchBy, it);
}
public static AdviceWithTask removeByType(final RouteDefinition route, final Class<?> type,
boolean selectFirst, boolean selectLast, int selectFrom, int selectTo) {
MatchBy matchBy = new MatchByType(type);
- Iterator<ProcessorDefinition> it = AdviceWithTasks.createMatchByIterator(route, matchBy, selectFirst, selectLast, selectFrom, selectTo);
+ Iterator<ProcessorDefinition<?>> it = AdviceWithTasks.createMatchByIterator(route, matchBy, selectFirst, selectLast, selectFrom, selectTo);
return doRemove(route, matchBy, it);
}
private static AdviceWithTask doRemove(final RouteDefinition route, final MatchBy matchBy,
- final Iterator<ProcessorDefinition> it) {
+ final Iterator<ProcessorDefinition<?>> it) {
return new AdviceWithTask() {
public void task() throws Exception {
boolean match = false;
while (it.hasNext()) {
- ProcessorDefinition output = it.next();
+ ProcessorDefinition<?> output = it.next();
if (matchBy.match(output)) {
- ProcessorDefinition parent = output.getParent();
+ ProcessorDefinition<?> parent = output.getParent();
if (parent != null) {
int index = parent.getOutputs().indexOf(output);
if (index != -1) {
@@ -208,37 +207,36 @@ public final class AdviceWithTasks {
};
}
- public static AdviceWithTask beforeByToString(final RouteDefinition route, final String toString, final ProcessorDefinition before,
+ public static AdviceWithTask beforeByToString(final RouteDefinition route, final String toString, final ProcessorDefinition<?> before,
boolean selectFirst, boolean selectLast, int selectFrom, int selectTo) {
MatchBy matchBy = new MatchByToString(toString);
- Iterator<ProcessorDefinition> it = AdviceWithTasks.createMatchByIterator(route, matchBy, selectFirst, selectLast, selectFrom, selectTo);
+ Iterator<ProcessorDefinition<?>> it = AdviceWithTasks.createMatchByIterator(route, matchBy, selectFirst, selectLast, selectFrom, selectTo);
return doBefore(route, matchBy, before, it);
}
- public static AdviceWithTask beforeById(final RouteDefinition route, final String id, final ProcessorDefinition before,
+ public static AdviceWithTask beforeById(final RouteDefinition route, final String id, final ProcessorDefinition<?> before,
boolean selectFirst, boolean selectLast, int selectFrom, int selectTo) {
MatchBy matchBy = new MatchById(id);
- Iterator<ProcessorDefinition> it = AdviceWithTasks.createMatchByIterator(route, matchBy, selectFirst, selectLast, selectFrom, selectTo);
+ Iterator<ProcessorDefinition<?>> it = AdviceWithTasks.createMatchByIterator(route, matchBy, selectFirst, selectLast, selectFrom, selectTo);
return doBefore(route, matchBy, before, it);
}
- public static AdviceWithTask beforeByType(final RouteDefinition route, final Class<?> type, final ProcessorDefinition before,
+ public static AdviceWithTask beforeByType(final RouteDefinition route, final Class<?> type, final ProcessorDefinition<?> before,
boolean selectFirst, boolean selectLast, int selectFrom, int selectTo) {
MatchBy matchBy = new MatchByType(type);
- Iterator<ProcessorDefinition> it = AdviceWithTasks.createMatchByIterator(route, matchBy, selectFirst, selectLast, selectFrom, selectTo);
+ Iterator<ProcessorDefinition<?>> it = AdviceWithTasks.createMatchByIterator(route, matchBy, selectFirst, selectLast, selectFrom, selectTo);
return doBefore(route, matchBy, before, it);
}
- @SuppressWarnings("unchecked")
- private static AdviceWithTask doBefore(final RouteDefinition route, final MatchBy matchBy, final ProcessorDefinition before,
- final Iterator<ProcessorDefinition> it) {
+ private static AdviceWithTask doBefore(final RouteDefinition route, final MatchBy matchBy, final ProcessorDefinition<?> before,
+ final Iterator<ProcessorDefinition<?>> it) {
return new AdviceWithTask() {
public void task() throws Exception {
boolean match = false;
while (it.hasNext()) {
- ProcessorDefinition output = it.next();
+ ProcessorDefinition<?> output = it.next();
if (matchBy.match(output)) {
- ProcessorDefinition parent = output.getParent();
+ ProcessorDefinition<?> parent = output.getParent();
if (parent != null) {
int index = parent.getOutputs().indexOf(output);
if (index != -1) {
@@ -258,38 +256,37 @@ public final class AdviceWithTasks {
};
}
- public static AdviceWithTask afterByToString(final RouteDefinition route, final String toString, final ProcessorDefinition after,
+ public static AdviceWithTask afterByToString(final RouteDefinition route, final String toString, final ProcessorDefinition<?> after,
boolean selectFirst, boolean selectLast, int selectFrom, int selectTo) {
MatchBy matchBy = new MatchByToString(toString);
- Iterator<ProcessorDefinition> it = AdviceWithTasks.createMatchByIterator(route, matchBy, selectFirst, selectLast, selectFrom, selectTo);
+ Iterator<ProcessorDefinition<?>> it = AdviceWithTasks.createMatchByIterator(route, matchBy, selectFirst, selectLast, selectFrom, selectTo);
return doAfter(route, matchBy, after, it);
}
- public static AdviceWithTask afterById(final RouteDefinition route, final String id, final ProcessorDefinition after,
+ public static AdviceWithTask afterById(final RouteDefinition route, final String id, final ProcessorDefinition<?> after,
boolean selectFirst, boolean selectLast, int selectFrom, int selectTo) {
MatchBy matchBy = new MatchById(id);
- Iterator<ProcessorDefinition> it = AdviceWithTasks.createMatchByIterator(route, matchBy, selectFirst, selectLast, selectFrom, selectTo);
+ Iterator<ProcessorDefinition<?>> it = AdviceWithTasks.createMatchByIterator(route, matchBy, selectFirst, selectLast, selectFrom, selectTo);
return doAfter(route, matchBy, after, it);
}
- public static AdviceWithTask afterByType(final RouteDefinition route, final Class<?> type, final ProcessorDefinition after,
+ public static AdviceWithTask afterByType(final RouteDefinition route, final Class<?> type, final ProcessorDefinition<?> after,
boolean selectFirst, boolean selectLast, int selectFrom, int selectTo) {
MatchBy matchBy = new MatchByType(type);
- Iterator<ProcessorDefinition> it = AdviceWithTasks.createMatchByIterator(route, matchBy, selectFirst, selectLast, selectFrom, selectTo);
+ Iterator<ProcessorDefinition<?>> it = AdviceWithTasks.createMatchByIterator(route, matchBy, selectFirst, selectLast, selectFrom, selectTo);
return doAfter(route, matchBy, after, it);
}
- @SuppressWarnings("unchecked")
- private static AdviceWithTask doAfter(final RouteDefinition route, final MatchBy matchBy, final ProcessorDefinition after,
- final Iterator<ProcessorDefinition> it) {
+ private static AdviceWithTask doAfter(final RouteDefinition route, final MatchBy matchBy, final ProcessorDefinition<?> after,
+ final Iterator<ProcessorDefinition<?>> it) {
return new AdviceWithTask() {
public void task() throws Exception {
boolean match = false;
while (it.hasNext()) {
- ProcessorDefinition output = it.next();
+ ProcessorDefinition<?> output = it.next();
if (matchBy.match(output)) {
- ProcessorDefinition parent = output.getParent();
+ ProcessorDefinition<?> parent = output.getParent();
if (parent != null) {
int index = parent.getOutputs().indexOf(output);
if (index != -1) {
@@ -345,15 +342,17 @@ public final class AdviceWithTasks {
*
* @return the iterator
*/
- private static Iterator<ProcessorDefinition> createMatchByIterator(final RouteDefinition route, final MatchBy matchBy,
+ private static Iterator<ProcessorDefinition<?>> createMatchByIterator(final RouteDefinition route, final MatchBy matchBy,
final boolean selectFirst, final boolean selectLast,
final int selectFrom, final int selectTo) {
// first iterator and apply match by
- List<ProcessorDefinition> matched = new ArrayList<ProcessorDefinition>();
+ List<ProcessorDefinition<?>> matched = new ArrayList<ProcessorDefinition<?>>();
+
+ @SuppressWarnings("rawtypes")
Iterator<ProcessorDefinition> itAll = ProcessorDefinitionHelper.filterTypeInOutputs(route.getOutputs(), ProcessorDefinition.class);
while (itAll.hasNext()) {
- ProcessorDefinition next = itAll.next();
+ ProcessorDefinition<?> next = itAll.next();
if (matchBy.match(next)) {
matched.add(next);
}
@@ -363,9 +362,9 @@ public final class AdviceWithTasks {
return createSelectorIterator(matched, selectFirst, selectLast, selectFrom, selectTo);
}
- private static Iterator<ProcessorDefinition> createSelectorIterator(final List<ProcessorDefinition> list, final boolean selectFirst,
+ private static Iterator<ProcessorDefinition<?>> createSelectorIterator(final List<ProcessorDefinition<?>> list, final boolean selectFirst,
final boolean selectLast, final int selectFrom, final int selectTo) {
- return new Iterator<ProcessorDefinition>() {
+ return new Iterator<ProcessorDefinition<?>>() {
private int current;
private boolean done;
@@ -405,8 +404,8 @@ public final class AdviceWithTasks {
}
@Override
- public ProcessorDefinition next() {
- ProcessorDefinition answer = list.get(current);
+ public ProcessorDefinition<?> next() {
+ ProcessorDefinition<?> answer = list.get(current);
current++;
return answer;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExecutorServiceAwareDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExecutorServiceAwareDefinition.java?rev=1244769&r1=1244768&r2=1244769&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExecutorServiceAwareDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExecutorServiceAwareDefinition.java Wed Feb 15 22:33:13 2012
@@ -25,7 +25,7 @@ import org.apache.camel.ExecutorServiceA
*
* @version
*/
-public interface ExecutorServiceAwareDefinition<Type extends ProcessorDefinition> extends ExecutorServiceAware {
+public interface ExecutorServiceAwareDefinition<Type extends ProcessorDefinition<?>> extends ExecutorServiceAware {
/**
* Setting the executor service for executing
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java?rev=1244769&r1=1244768&r2=1244769&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java Wed Feb 15 22:33:13 2012
@@ -130,17 +130,17 @@ public class InterceptDefinition extends
return;
}
- ProcessorDefinition first = getOutputs().get(0);
+ ProcessorDefinition<?> first = getOutputs().get(0);
if (first instanceof WhenDefinition) {
WhenDefinition when = (WhenDefinition) first;
// move this outputs to the when, expect the first one
// as the first one is the interceptor itself
for (int i = 1; i < outputs.size(); i++) {
- ProcessorDefinition out = outputs.get(i);
+ ProcessorDefinition<?> out = outputs.get(i);
when.addOutput(out);
}
// remove the moved from the original output, by just keeping the first one
- ProcessorDefinition keep = outputs.get(0);
+ ProcessorDefinition<?> keep = outputs.get(0);
clearOutput();
outputs.add(keep);
}
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=1244769&r1=1244768&r2=1244769&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 15 22:33:13 2012
@@ -36,7 +36,7 @@ import org.apache.camel.util.ObjectHelpe
*/
@XmlRootElement(name = "log")
@XmlAccessorType(XmlAccessType.FIELD)
-public class LogDefinition extends NoOutputDefinition {
+public class LogDefinition extends NoOutputDefinition<LogDefinition> {
@XmlAttribute(required = true)
private String message;
@XmlAttribute
@@ -87,7 +87,7 @@ public class LogDefinition extends NoOut
}
@Override
- public void addOutput(ProcessorDefinition output) {
+ public void addOutput(ProcessorDefinition<?> output) {
// add outputs on parent as this log does not support outputs
getParent().addOutput(output);
}
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=1244769&r1=1244768&r2=1244769&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 22:33:13 2012
@@ -77,7 +77,7 @@ import org.slf4j.LoggerFactory;
* @version
*/
@XmlAccessorType(XmlAccessType.PROPERTY)
-public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>> extends OptionalIdentifiedDefinition implements Block {
+public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>> extends OptionalIdentifiedDefinition<Type> implements Block {
protected final transient Logger log = LoggerFactory.getLogger(getClass());
protected Boolean inheritErrorHandler;
private NodeFactory nodeFactory;
@@ -155,6 +155,7 @@ public abstract class ProcessorDefinitio
return children;
}
+ @Override
public void addOutput(ProcessorDefinition<?> output) {
if (!blocks.isEmpty()) {
// let the Block deal with the output
@@ -1539,7 +1540,7 @@ public abstract class ProcessorDefinitio
@SuppressWarnings("unchecked")
@Deprecated
public Type routingSlip(String header, String uriDelimiter) {
- RoutingSlipDefinition answer = new RoutingSlipDefinition(header, uriDelimiter);
+ RoutingSlipDefinition<Type> answer = new RoutingSlipDefinition<Type>(header, uriDelimiter);
addOutput(answer);
return (Type) this;
}
@@ -1561,7 +1562,7 @@ public abstract class ProcessorDefinitio
@SuppressWarnings("unchecked")
@Deprecated
public Type routingSlip(String header) {
- RoutingSlipDefinition answer = new RoutingSlipDefinition(header);
+ RoutingSlipDefinition<Type> answer = new RoutingSlipDefinition<Type>(header);
addOutput(answer);
return (Type) this;
}
@@ -1585,7 +1586,7 @@ public abstract class ProcessorDefinitio
@SuppressWarnings("unchecked")
@Deprecated
public Type routingSlip(String header, String uriDelimiter, boolean ignoreInvalidEndpoints) {
- RoutingSlipDefinition answer = new RoutingSlipDefinition(header, uriDelimiter);
+ RoutingSlipDefinition<Type> answer = new RoutingSlipDefinition<Type>(header, uriDelimiter);
answer.setIgnoreInvalidEndpoints(ignoreInvalidEndpoints);
addOutput(answer);
return (Type) this;
@@ -1610,7 +1611,7 @@ public abstract class ProcessorDefinitio
@SuppressWarnings("unchecked")
@Deprecated
public Type routingSlip(String header, boolean ignoreInvalidEndpoints) {
- RoutingSlipDefinition answer = new RoutingSlipDefinition(header);
+ RoutingSlipDefinition<Type> answer = new RoutingSlipDefinition<Type>(header);
answer.setIgnoreInvalidEndpoints(ignoreInvalidEndpoints);
addOutput(answer);
return (Type) this;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java?rev=1244769&r1=1244768&r2=1244769&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java Wed Feb 15 22:33:13 2012
@@ -45,7 +45,7 @@ import org.apache.camel.util.CamelContex
*/
@XmlRootElement(name = "recipientList")
@XmlAccessorType(XmlAccessType.FIELD)
-public class RecipientListDefinition<Type extends ProcessorDefinition> extends NoOutputExpressionNode implements ExecutorServiceAwareDefinition<RecipientListDefinition> {
+public class RecipientListDefinition<Type extends ProcessorDefinition<Type>> extends NoOutputExpressionNode implements ExecutorServiceAwareDefinition<RecipientListDefinition<Type>> {
@XmlTransient
private AggregationStrategy aggregationStrategy;
@XmlTransient
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=1244769&r1=1244768&r2=1244769&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 22:33:13 2012
@@ -35,7 +35,7 @@ import org.apache.camel.spi.RouteContext
*/
@XmlRootElement(name = "routingSlip")
@XmlAccessorType(XmlAccessType.FIELD)
-public class RoutingSlipDefinition<Type extends ProcessorDefinition> extends NoOutputExpressionNode {
+public class RoutingSlipDefinition<Type extends ProcessorDefinition<Type>> extends NoOutputExpressionNode {
public static final String DEFAULT_DELIMITER = ",";
@XmlAttribute
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java?rev=1244769&r1=1244768&r2=1244769&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java Wed Feb 15 22:33:13 2012
@@ -34,7 +34,7 @@ import org.apache.camel.builder.xml.Time
*/
@XmlRootElement(name = "threadPoolProfile")
@XmlAccessorType(XmlAccessType.FIELD)
-public class ThreadPoolProfileDefinition extends OptionalIdentifiedDefinition {
+public class ThreadPoolProfileDefinition extends OptionalIdentifiedDefinition<ThreadPoolProfileDefinition> {
@XmlAttribute
private Boolean defaultProfile;
@XmlAttribute
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/WireTapDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/WireTapDefinition.java?rev=1244769&r1=1244768&r2=1244769&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/WireTapDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/WireTapDefinition.java Wed Feb 15 22:33:13 2012
@@ -42,7 +42,7 @@ import org.apache.camel.util.CamelContex
*/
@XmlRootElement(name = "wireTap")
@XmlAccessorType(XmlAccessType.FIELD)
-public class WireTapDefinition<Type extends ProcessorDefinition> extends NoOutputDefinition implements ExecutorServiceAwareDefinition<ProcessorDefinition> {
+public class WireTapDefinition<Type extends ProcessorDefinition<Type>> extends NoOutputDefinition<Type> implements ExecutorServiceAwareDefinition<WireTapDefinition<Type>> {
@XmlAttribute
protected String uri;
@XmlAttribute
@@ -145,7 +145,7 @@ public class WireTapDefinition<Type exte
}
@Override
- public void addOutput(ProcessorDefinition output) {
+ public void addOutput(ProcessorDefinition<?> output) {
// add outputs on parent as this wiretap does not support outputs
getParent().addOutput(output);
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/view/NodeData.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/view/NodeData.java?rev=1244769&r1=1244768&r2=1244769&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/view/NodeData.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/view/NodeData.java Wed Feb 15 22:33:13 2012
@@ -51,10 +51,9 @@ public class NodeData {
public String nodeType;
public boolean nodeWritten;
public String url;
- public List<ProcessorDefinition> outputs;
+ public List<ProcessorDefinition<?>> outputs;
public String association = "property";
- @SuppressWarnings("unchecked")
public NodeData(String id, Object node, String imagePrefix) {
this.id = id;
@@ -94,7 +93,7 @@ public class NodeData {
this.edgeLabel = "";
ChoiceDefinition choice = (ChoiceDefinition)node;
- List<ProcessorDefinition> outputs = new ArrayList<ProcessorDefinition>(choice.getWhenClauses());
+ List<ProcessorDefinition<?>> outputs = new ArrayList<ProcessorDefinition<?>>(choice.getWhenClauses());
if (choice.getOtherwise() != null) {
outputs.add(choice.getOtherwise());
}
@@ -156,7 +155,7 @@ public class NodeData {
this.url = "http://camel.apache.org/" + this.nodeType.toLowerCase().replace(' ', '-') + ".html";
}
if (node instanceof ProcessorDefinition && this.outputs == null) {
- ProcessorDefinition processorType = (ProcessorDefinition)node;
+ ProcessorDefinition<?> processorType = (ProcessorDefinition<?>)node;
this.outputs = processorType.getOutputs();
}
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/view/RouteDotGenerator.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/view/RouteDotGenerator.java?rev=1244769&r1=1244768&r2=1244769&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/view/RouteDotGenerator.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/view/RouteDotGenerator.java Wed Feb 15 22:33:13 2012
@@ -83,13 +83,12 @@ public class RouteDotGenerator extends G
}
}
- @SuppressWarnings("unchecked")
- protected NodeData printNode(PrintWriter writer, NodeData fromData, ProcessorDefinition node) {
+ protected NodeData printNode(PrintWriter writer, NodeData fromData, ProcessorDefinition<?> node) {
if (node instanceof MulticastDefinition) {
// no need for a multicast or interceptor node
- List<ProcessorDefinition> outputs = node.getOutputs();
+ List<ProcessorDefinition<?>> outputs = node.getOutputs();
boolean isPipeline = isPipeline(node);
- for (ProcessorDefinition output : outputs) {
+ for (ProcessorDefinition<?> output : outputs) {
NodeData out = printNode(writer, fromData, output);
// if in pipeline then we should move the from node to the next in the pipeline
if (isPipeline) {
@@ -116,9 +115,9 @@ public class RouteDotGenerator extends G
}
// now lets write any children
- List<ProcessorDefinition> outputs = toData.outputs;
+ List<ProcessorDefinition<?>> outputs = toData.outputs;
if (outputs != null) {
- for (ProcessorDefinition output : outputs) {
+ for (ProcessorDefinition<?> output : outputs) {
NodeData newData = printNode(writer, toData, output);
if (!isMulticastNode(node)) {
toData = newData;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/view/XmlGraphGenerator.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/view/XmlGraphGenerator.java?rev=1244769&r1=1244768&r2=1244769&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/view/XmlGraphGenerator.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/view/XmlGraphGenerator.java Wed Feb 15 22:33:13 2012
@@ -98,12 +98,11 @@ public class XmlGraphGenerator extends G
}
}
- @SuppressWarnings("unchecked")
- protected NodeData printNode(PrintWriter writer, NodeData fromData, ProcessorDefinition node) {
+ protected NodeData printNode(PrintWriter writer, NodeData fromData, ProcessorDefinition<?> node) {
if (node instanceof MulticastDefinition) {
// no need for a multicast node
- List<ProcessorDefinition> outputs = node.getOutputs();
- for (ProcessorDefinition output : outputs) {
+ List<ProcessorDefinition<?>> outputs = node.getOutputs();
+ for (ProcessorDefinition<?> output : outputs) {
printNode(writer, fromData, output);
}
return fromData;
@@ -126,9 +125,9 @@ public class XmlGraphGenerator extends G
}
// now lets write any children
- List<ProcessorDefinition> outputs = toData.outputs;
+ List<ProcessorDefinition<?>> outputs = toData.outputs;
if (outputs != null) {
- for (ProcessorDefinition output : outputs) {
+ for (ProcessorDefinition<?> output : outputs) {
NodeData newData = printNode(writer, toData, output);
if (!isMulticastNode(node)) {
toData = newData;
Modified: camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/TemporalRule.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/TemporalRule.java?rev=1244769&r1=1244768&r2=1244769&view=diff
==============================================================================
--- camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/TemporalRule.java (original)
+++ camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/TemporalRule.java Wed Feb 15 22:33:13 2012
@@ -50,6 +50,8 @@ public class TemporalRule extends Servic
private long expectedMillis;
private long overdueMillis;
private Processor overdueAction;
+
+ @SuppressWarnings("rawtypes")
private OutputDefinition<?> overdueProcessors = new OutputDefinition();
public TemporalRule(TimeExpression first, TimeExpression second) {