Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ErrorHandlerSupportTest.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ErrorHandlerSupportTest.java?rev=881168&r1=881167&r2=881168&view=diff ============================================================================== --- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ErrorHandlerSupportTest.java (original) +++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ErrorHandlerSupportTest.java Tue Nov 17 06:28:36 2009 @@ -27,7 +27,7 @@ public class ErrorHandlerSupportTest extends TestCase { public void testOnePolicyChildFirst() { - List<Class<? extends Exception>> exceptions = new ArrayList<Class<? extends Exception>>(); + List<Class<? extends Throwable>> exceptions = new ArrayList<Class<? extends Throwable>>(); exceptions.add(ChildException.class); exceptions.add(ParentException.class); @@ -39,7 +39,7 @@ } public void testOnePolicyChildLast() { - List<Class<? extends Exception>> exceptions = new ArrayList<Class<? extends Exception>>(); + List<Class<? extends Throwable>> exceptions = new ArrayList<Class<? extends Throwable>>(); exceptions.add(ParentException.class); exceptions.add(ChildException.class);
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=881168&r1=881167&r2=881168&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 Tue Nov 17 06:28:36 2009 @@ -50,10 +50,10 @@ return result; } - 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-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java?rev=881168&r1=881167&r2=881168&view=diff ============================================================================== --- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java (original) +++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java Tue Nov 17 06:28:36 2009 @@ -332,8 +332,8 @@ } private void initParent(ProcessorDefinition<?> parent) { - List<ProcessorDefinition> children = parent.getOutputs(); - for (ProcessorDefinition child : children) { + List<ProcessorDefinition<?>> children = parent.getOutputs(); + for (ProcessorDefinition<?> child : children) { child.setParent(parent); if (child.getOutputs() != null) { // recursive the children @@ -471,14 +471,14 @@ private void initPolicies(RouteDefinition route) { // setup the policies as JAXB yet again have not created a correct model for us - List<ProcessorDefinition> types = route.getOutputs(); + List<ProcessorDefinition<?>> types = route.getOutputs(); // we need two types as transacted cannot extend policy due JAXB limitations PolicyDefinition policy = null; TransactedDefinition transacted = null; // add to correct type - for (ProcessorDefinition type : types) { + for (ProcessorDefinition<?> type : types) { if (type instanceof PolicyDefinition) { policy = (PolicyDefinition) type; } else if (type instanceof TransactedDefinition) { Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/XmlConfigTestSupport.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/XmlConfigTestSupport.java?rev=881168&r1=881167&r2=881168&view=diff ============================================================================== --- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/XmlConfigTestSupport.java (original) +++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/XmlConfigTestSupport.java Tue Nov 17 06:28:36 2009 @@ -46,7 +46,7 @@ FromDefinition fromType = inputs.get(0); assertEquals("from URI", "seda://test.a", fromType.getEndpoint().getEndpointUri()); - List<ProcessorDefinition> outputs = route.getOutputs(); + List<ProcessorDefinition<?>> outputs = route.getOutputs(); assertEquals("Number of outputs", 1, outputs.size()); } } Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/CatchDefinitionRenderer.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/CatchDefinitionRenderer.java?rev=881168&r1=881167&r2=881168&view=diff ============================================================================== --- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/CatchDefinitionRenderer.java (original) +++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/CatchDefinitionRenderer.java Tue Nov 17 06:28:36 2009 @@ -33,8 +33,8 @@ public static void render(StringBuilder buffer, ProcessorDefinition<?> processor) { CatchDefinition catchDef = (CatchDefinition)processor; buffer.append(".").append(catchDef.getShortName()).append("("); - List<Class<Exception>> exceptions = catchDef.getExceptionClasses(); - for (Class<Exception> clazz : exceptions) { + List<Class<? extends Throwable>> exceptions = catchDef.getExceptionClasses(); + for (Class<? extends Throwable> clazz : exceptions) { buffer.append(clazz.getSimpleName()).append(".class"); if (clazz != exceptions.get(exceptions.size() - 1)) { buffer.append(", "); @@ -48,8 +48,8 @@ buffer.append(".handled(").append(handled).append(")"); } - List<ProcessorDefinition> branches = catchDef.getOutputs(); - for (ProcessorDefinition branch : branches) { + List<ProcessorDefinition<?>> branches = catchDef.getOutputs(); + for (ProcessorDefinition<?> branch : branches) { SendDefinitionRenderer.render(buffer, branch); } } Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/GroovyRenderer.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/GroovyRenderer.java?rev=881168&r1=881167&r2=881168&view=diff ============================================================================== --- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/GroovyRenderer.java (original) +++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/GroovyRenderer.java Tue Nov 17 06:28:36 2009 @@ -41,7 +41,7 @@ */ public static void renderRoute(StringBuilder buffer, RouteDefinition route) { List<FromDefinition> inputs = route.getInputs(); - List<ProcessorDefinition> outputs = route.getOutputs(); + List<ProcessorDefinition<?>> outputs = route.getOutputs(); // render the error handler if (!(route.getErrorHandlerBuilder() instanceof ErrorHandlerBuilderRef)) { @@ -51,7 +51,7 @@ // render the global dsl not started with from, like global // intercept, interceptFrom,interceptSendToEndpoint, onCompletion, // onException - for (ProcessorDefinition processor : outputs) { + for (ProcessorDefinition<?> processor : outputs) { if (processor.getParent() == null && !(processor instanceof SendDefinition)) { ProcessorDefinitionRenderer.render(buffer, processor); buffer.append(";"); @@ -81,7 +81,7 @@ } // render the outputs of the router - for (ProcessorDefinition processor : outputs) { + for (ProcessorDefinition<?> processor : outputs) { if (processor.getParent() == route || processor instanceof SendDefinition) { ProcessorDefinitionRenderer.render(buffer, processor); } Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/LoadBalanceDefinitionRenderer.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/LoadBalanceDefinitionRenderer.java?rev=881168&r1=881167&r2=881168&view=diff ============================================================================== --- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/LoadBalanceDefinitionRenderer.java (original) +++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/LoadBalanceDefinitionRenderer.java Tue Nov 17 06:28:36 2009 @@ -64,7 +64,7 @@ buffer.append(".topic()"); } - List<ProcessorDefinition> branches = loadB.getOutputs(); + List<ProcessorDefinition<?>> branches = loadB.getOutputs(); for (ProcessorDefinition<?> branch : branches) { ProcessorDefinitionRenderer.render(buffer, branch); } Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/OnCompletionDefinitionRenderer.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/OnCompletionDefinitionRenderer.java?rev=881168&r1=881167&r2=881168&view=diff ============================================================================== --- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/OnCompletionDefinitionRenderer.java (original) +++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/OnCompletionDefinitionRenderer.java Tue Nov 17 06:28:36 2009 @@ -31,7 +31,7 @@ // Utility class, no public or protected default constructor } - public static void render(StringBuilder buffer, ProcessorDefinition processor) { + public static void render(StringBuilder buffer, ProcessorDefinition<?> processor) { // if not a global onCompletion, add a period boolean notGlobal = buffer.toString().endsWith(")"); if (notGlobal) { @@ -57,8 +57,8 @@ if (onComplete.getOnFailureOnly()) { buffer.append(".onFailureOnly()"); } - List<ProcessorDefinition> branches = onComplete.getOutputs(); - for (ProcessorDefinition branch : branches) { + List<ProcessorDefinition<?>> branches = onComplete.getOutputs(); + for (ProcessorDefinition<?> branch : branches) { SendDefinitionRenderer.render(buffer, branch); } Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/OnExceptionDefinitionRenderer.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/OnExceptionDefinitionRenderer.java?rev=881168&r1=881167&r2=881168&view=diff ============================================================================== --- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/OnExceptionDefinitionRenderer.java (original) +++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/OnExceptionDefinitionRenderer.java Tue Nov 17 06:28:36 2009 @@ -31,7 +31,7 @@ // Utility class, no public or protected default constructor } - public static void render(StringBuilder buffer, ProcessorDefinition processor) { + public static void render(StringBuilder buffer, ProcessorDefinition<?> processor) { // if not a global onCompletion, add a period boolean notGlobal = buffer.toString().endsWith(")"); if (notGlobal) { @@ -40,8 +40,8 @@ OnExceptionDefinition onException = (OnExceptionDefinition)processor; buffer.append(processor.getShortName()).append("("); - List<Class<Exception>> exceptions = onException.getExceptionClasses(); - for (Class<Exception> excep : exceptions) { + List<Class<? extends Throwable>> exceptions = onException.getExceptionClasses(); + for (Class<? extends Throwable> excep : exceptions) { buffer.append(excep.getSimpleName()).append(".class"); if (excep != exceptions.get(exceptions.size() - 1)) { buffer.append(", "); @@ -79,8 +79,8 @@ } } - List<ProcessorDefinition> branches = onException.getOutputs(); - for (ProcessorDefinition branch : branches) { + List<ProcessorDefinition<?>> branches = onException.getOutputs(); + for (ProcessorDefinition<?> branch : branches) { SendDefinitionRenderer.render(buffer, branch); } } Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/OutputDefinitionRenderer.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/OutputDefinitionRenderer.java?rev=881168&r1=881167&r2=881168&view=diff ============================================================================== --- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/OutputDefinitionRenderer.java (original) +++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/OutputDefinitionRenderer.java Tue Nov 17 06:28:36 2009 @@ -57,8 +57,8 @@ // Utility class, no public or protected default constructor } - public static void render(StringBuilder buffer, ProcessorDefinition processor) { - OutputDefinition out = (OutputDefinition)processor; + public static void render(StringBuilder buffer, ProcessorDefinition<?> processor) { + OutputDefinition<?> out = (OutputDefinition<?>)processor; boolean notGlobal = buffer.toString().endsWith(")"); if (notGlobal) { buffer.append("."); @@ -137,7 +137,7 @@ } } - private static void renderAop(StringBuilder buffer, OutputDefinition out) { + private static void renderAop(StringBuilder buffer, OutputDefinition<?> out) { buffer.append("()"); AOPDefinition aop = (AOPDefinition)out; if (aop.getBeforeUri() != null) { @@ -157,7 +157,7 @@ } } - private static void renderBean(StringBuilder buffer, ProcessorDefinition processor) { + private static void renderBean(StringBuilder buffer, ProcessorDefinition<?> processor) { BeanDefinition beanDef = (BeanDefinition)processor; if (beanDef.getRef() != null) { buffer.append("Ref(\"").append(beanDef.getRef()).append("\""); @@ -168,17 +168,17 @@ } } - private static void renderFinally(StringBuilder buffer, OutputDefinition out) { + private static void renderFinally(StringBuilder buffer, OutputDefinition<?> out) { buffer.append("()"); FinallyDefinition finallyDef = (FinallyDefinition)out; - List<ProcessorDefinition> branches = finallyDef.getOutputs(); - for (ProcessorDefinition branch : branches) { + List<ProcessorDefinition<?>> branches = finallyDef.getOutputs(); + for (ProcessorDefinition<?> branch : branches) { SendDefinitionRenderer.render(buffer, branch); } buffer.append(".end()"); } - private static void renderPolicy(StringBuilder buffer, OutputDefinition out) { + private static void renderPolicy(StringBuilder buffer, OutputDefinition<?> out) { PolicyDefinition policy = (PolicyDefinition)out; buffer.append("("); if (policy.getRef() != null) { @@ -187,7 +187,7 @@ buffer.append(")"); } - private static void renderPollEnrich(StringBuilder buffer, OutputDefinition out) { + private static void renderPollEnrich(StringBuilder buffer, OutputDefinition<?> out) { PollEnrichDefinition pollEnrich = (PollEnrichDefinition)out; buffer.append("(\""); buffer.append(pollEnrich.getResourceUri()).append("\", ").append(pollEnrich.getTimeout()); @@ -197,7 +197,7 @@ buffer.append(")"); } - private static void renderProcess(StringBuilder buffer, OutputDefinition out) { + private static void renderProcess(StringBuilder buffer, OutputDefinition<?> out) { ProcessDefinition process = (ProcessDefinition)out; if (process.getRef() != null) { buffer.append("Ref(\"").append(process.getRef()).append("\")"); @@ -208,7 +208,7 @@ } } - private static void renderThreads(StringBuilder buffer, OutputDefinition out) { + private static void renderThreads(StringBuilder buffer, OutputDefinition<?> out) { ThreadsDefinition threads = (ThreadsDefinition)out; buffer.append("("); if (threads.getPoolSize() != null) { @@ -222,7 +222,7 @@ } } - private static void renderTransacted(StringBuilder buffer, OutputDefinition out) { + private static void renderTransacted(StringBuilder buffer, OutputDefinition<?> out) { TransactedDefinition transacted = (TransactedDefinition)out; buffer.append("("); if (transacted.getRef() != null) {
