You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2012/01/15 11:38:45 UTC
svn commit: r1231645 [1/4] - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/builder/
camel-core/src/main/java/org/apache/camel/component/bean/
camel-core/src/main/java/org/apache/camel/impl/
camel-core/src/main/java/org/apache/camel/managem...
Author: davsclaus
Date: Sun Jan 15 10:38:40 2012
New Revision: 1231645
URL: http://svn.apache.org/viewvc?rev=1231645&view=rev
Log:
CAMEL-4796: Applied rawtypes-3 patch. Thanks to Babak.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/NotifyBuilder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ProxyBuilder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/ProxyHelper.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ConditionSupport.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultDebugger.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/EventDrivenConsumerRoute.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/RouteService.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledBatchPollingConsumer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationInterceptStrategy.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/InterceptDefinition.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/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/ProcessorDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteContextRefDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/WhenDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultChannel.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceEventHandler.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceInterceptorFactory.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceEventHandler.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptorFactory.java
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/Condition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/Debugger.java
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ManagementObjectStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/support/TimerListenerManager.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/UnitOfWorkHelper.java
camel/trunk/camel-core/src/main/java/org/apache/camel/view/GraphSupport.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterInvalidValueTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterValueTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersAndBodyInjectionTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersInjectionTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/MyApplicationException.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/MyCustomException.java
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/CamelContextAddRouteDefinitionsFromXmlTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/RegistryTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/SimpleRegistryTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ExceptionPolicyIssueTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SplitterUsingBeanReturningMessageTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/TwoTimerWithJMXIssue.java
camel/trunk/camel-core/src/test/java/org/apache/camel/language/SimpleOgnlMapIssueTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/language/TokenizerTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationOnlyRegisterProcessorWithCustomIdTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxNotificationEventNotifierTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterCamelContextTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/model/ChoiceDefinitionTest.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/Animal.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChoiceWithEndTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/CustomProcessorFactoryTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DataFormatTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelHandledExampleTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DualPipelineTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ErrorHandlerSupportTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FailOverLoadBalanceTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/NavigateRouteTest.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/SortBodyTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitWithEndTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterWithCustomThreadPoolExecutorTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncTraceHandlerTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/CustomExceptionPolicyStrategyTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyUsingOnlyWhenTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyUsingWhenTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/ParentChildInterceptStrategyTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/CustomInterceptorRouteWithChildOutputTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/DebugExceptionBreakpointTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/DebugExceptionEventBreakpointTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/DebugSingleStepConditionTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/DebugSingleStepTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/DebugTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/TraceHandlerTestHandler.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/TraceInterceptorFactoryCreatesHandlerTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/TraceInterceptorSubclassFactory.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/MyFunctionalException.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/MyTechnicalException.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionWhenSimpleOgnlTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/util/CaseInsensitiveMapTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/util/OrderedComparatorTest.java
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/BamProcessorSupport.java
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyAbstractFactory.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCarQuoteAndCommaDelimiterTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyInlinedQuotesCsvUnmarshallTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPipeDelimiterTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyTabSeparatorTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyUnmarshalCommaIssueTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trim/BindySimpleFixedLengthUnmarshallTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trimfield/BindySimpleFixedLengthUnmarshallTrimFieldTest.java
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
camel/trunk/components/camel-cache/src/main/java/org/apache/camel/component/cache/CacheConfiguration.java
camel/trunk/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvDataFormat.java
camel/trunk/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/dto/CustomerDTO.java
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFilePollingConsumerPollStrategy.java
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileProducer.java
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpProcessStrategyFactory.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRemoteFileSorterTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerMultipleDirectoriesTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerWithNoFileOptionTest.java
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthComponent.java
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/login/GLoginComponent.java
camel/trunk/components/camel-gae/src/main/java/org/apache/camel/component/gae/mail/GMailComponent.java
camel/trunk/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/GHttpTestServlet.java
camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyExpression.java
camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerForSpringTest.java
camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerTest.java
camel/trunk/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/JavaSpaceComponent.java
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/javabody/MyCoolBean.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerQueryParamTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/MyCoolBean.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/proxy/MyAppException.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsMapMessageTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsObjectMessageTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutBeanReturnNullTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageTypeTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteDeliveryModePreserveQoSTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/PurchaseOrder.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/bind/JmsMessageBindTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/bind/MyBean.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/discovery/JmsDiscoveryTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/discovery/MyRegistry.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/discovery/MyService.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/DummyOrder.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsGetHeaderKeyFormatIssueTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsPassThroughtJmsKeyFormatStrategyEndUserIssueTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsPassThroughtJmsKeyFormatStrategyTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsPassThroughtJmsKeyFormatStrategyUsingJmsConfigurationTest.java
camel/trunk/components/camel-josql/src/main/java/org/apache/camel/builder/sql/SqlBuilder.java
camel/trunk/components/camel-josql/src/test/java/org/apache/camel/builder/sql/SqlTest.java
camel/trunk/components/camel-josql/src/test/java/org/apache/camel/lanaguage/sql/SqlLanguageTest.java
camel/trunk/components/camel-kestrel/src/main/java/org/apache/camel/component/kestrel/KestrelComponent.java
camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java
camel/trunk/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterConfiguration.java
camel/trunk/components/camel-ruby/src/main/java/org/apache/camel/ruby/ScriptRouteBuilder.java
camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
camel/trunk/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpComponent.java
camel/trunk/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrUpdateTest.java
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationMessage.java
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationProducer.java
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapter.java
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapter.java
camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapterTest.java
camel/trunk/components/camel-spring-security/src/test/java/org/apache/camel/component/spring/security/SpringSecurityAuthorizationPolicyTest.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/ContextScanRouteBuilderFinder.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/event/DummyEvent.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/ContainerWideInterceptor.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/OrderFailedException.java
camel/trunk/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamGroupLinesTest.java
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugJUnit4Test.java
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugNoLazyTypeConverterTest.java
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugSpringTest.java
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugTest.java
camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugNoLazyTypeConverterTest.java
camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugSpringTest.java
camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugTest.java
camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugTestNGTest.java
camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/completers/RouteCompleter.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/InvalidOrderException.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/test/SpringDebugBeforeTest.java
camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
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=1231645&r1=1231644&r2=1231645&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 Sun Jan 15 10:38:40 2012
@@ -47,7 +47,7 @@ public final class AdviceWithTasks {
String getId();
- boolean match(ProcessorDefinition processor);
+ boolean match(ProcessorDefinition<?> processor);
}
/**
@@ -65,7 +65,7 @@ public final class AdviceWithTasks {
return id;
}
- public boolean match(ProcessorDefinition processor) {
+ public boolean match(ProcessorDefinition<?> processor) {
return EndpointHelper.matchPattern(processor.getId(), id);
}
}
@@ -85,7 +85,7 @@ public final class AdviceWithTasks {
return toString;
}
- public boolean match(ProcessorDefinition processor) {
+ public boolean match(ProcessorDefinition<?> processor) {
return EndpointHelper.matchPattern(processor.toString(), toString);
}
}
@@ -105,7 +105,7 @@ public final class AdviceWithTasks {
return type.getSimpleName();
}
- public boolean match(ProcessorDefinition processor) {
+ public boolean match(ProcessorDefinition<?> processor) {
return type.isAssignableFrom(processor.getClass());
}
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/NotifyBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/NotifyBuilder.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/NotifyBuilder.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/NotifyBuilder.java Sun Jan 15 10:38:40 2012
@@ -1058,7 +1058,7 @@ public class NotifyBuilder {
return doWhenBodies(bodyList, false, true);
}
- private NotifyBuilder doWhenBodies(final List bodies, final boolean received, final boolean exact) {
+ private NotifyBuilder doWhenBodies(final List<?> bodies, final boolean received, final boolean exact) {
stack.add(new EventPredicateSupport() {
private boolean matches;
private int current;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ProxyBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ProxyBuilder.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ProxyBuilder.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ProxyBuilder.java Sun Jan 15 10:38:40 2012
@@ -60,6 +60,21 @@ public final class ProxyBuilder {
/**
* Builds the proxy.
*
+ * @param interfaceClass the service interface
+ * @return the proxied bean
+ * @throws Exception is thrown if error creating the proxy
+ */
+ @SuppressWarnings("unchecked")
+ public <T> T build(Class<T> interfaceClass) throws Exception {
+ // this method is introduced to avoid compiler warnings about the
+ // generic Class arrays in the case we've got only one single Class
+ // to build a Proxy for
+ return build((Class<T>[]) new Class[] {interfaceClass});
+ }
+
+ /**
+ * Builds the proxy.
+ *
* @param interfaceClasses the service interface(s)
* @return the proxied bean
* @throws Exception is thrown if error creating the proxy
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/ProxyHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/ProxyHelper.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/ProxyHelper.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/ProxyHelper.java Sun Jan 15 10:38:40 2012
@@ -43,15 +43,28 @@ public final class ProxyHelper {
return (T) Proxy.newProxyInstance(classLoader, interfaces.clone(), new CamelInvocationHandler(endpoint, producer, methodCache));
}
+ /**
+ * Creates a Proxy which sends the exchange to the endpoint.
+ */
+ public static <T> T createProxy(Endpoint endpoint, ClassLoader cl, Class<T> interfaceClass, MethodInfoCache methodCache) throws Exception {
+ return createProxy(endpoint, cl, toArray(interfaceClass), methodCache);
+ }
/**
* Creates a Proxy which sends the exchange to the endpoint.
*/
- public static <T> T createProxy(Endpoint endpoint, ClassLoader cl, Class<T>[] interfaces, MethodInfoCache methodCache) throws Exception {
+ public static <T> T createProxy(Endpoint endpoint, ClassLoader cl, Class<T>[] interfaceClasses, MethodInfoCache methodCache) throws Exception {
Producer producer = endpoint.createProducer();
// ensure the producer is started
ServiceHelper.startService(producer);
- return createProxyObject(endpoint, producer, cl, interfaces, methodCache);
+ return createProxyObject(endpoint, producer, cl, interfaceClasses, methodCache);
+ }
+
+ /**
+ * Creates a Proxy which sends the exchange to the endpoint.
+ */
+ public static <T> T createProxy(Endpoint endpoint, ClassLoader cl, Class<T> interfaceClass) throws Exception {
+ return createProxy(endpoint, cl, toArray(interfaceClass));
}
/**
@@ -61,6 +74,12 @@ public final class ProxyHelper {
return createProxy(endpoint, cl, interfaceClasses, createMethodInfoCache(endpoint));
}
+ /**
+ * Creates a Proxy which sends the exchange to the endpoint.
+ */
+ public static <T> T createProxy(Endpoint endpoint, Class<T> interfaceClass) throws Exception {
+ return createProxy(endpoint, toArray(interfaceClass));
+ }
/**
* Creates a Proxy which sends the exchange to the endpoint.
@@ -72,6 +91,13 @@ public final class ProxyHelper {
/**
* Creates a Proxy which sends the exchange to the endpoint.
*/
+ public static <T> T createProxy(Endpoint endpoint, Producer producer, Class<T> interfaceClass) throws Exception {
+ return createProxy(endpoint, producer, toArray(interfaceClass));
+ }
+
+ /**
+ * Creates a Proxy which sends the exchange to the endpoint.
+ */
public static <T> T createProxy(Endpoint endpoint, Producer producer, Class<T>... interfaceClasses) throws Exception {
return createProxyObject(endpoint, producer, getClassLoader(interfaceClasses), interfaceClasses, createMethodInfoCache(endpoint));
}
@@ -89,4 +115,12 @@ public final class ProxyHelper {
protected static MethodInfoCache createMethodInfoCache(Endpoint endpoint) {
return new MethodInfoCache(endpoint.getCamelContext());
}
+
+ @SuppressWarnings("unchecked")
+ private static <T> Class<T>[] toArray(Class<T> interfaceClass) {
+ // this method and it's usage is introduced to avoid compiler warnings
+ // about the generic Class arrays in the case we've got only one single
+ // Class to build a Proxy for
+ return new Class[] {interfaceClass};
+ }
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ConditionSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ConditionSupport.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ConditionSupport.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ConditionSupport.java Sun Jan 15 10:38:40 2012
@@ -30,7 +30,7 @@ import org.apache.camel.spi.Condition;
*/
public class ConditionSupport implements Condition {
- public boolean matchProcess(Exchange exchange, Processor processor, ProcessorDefinition definition) {
+ public boolean matchProcess(Exchange exchange, Processor processor, ProcessorDefinition<?> definition) {
return false;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java Sun Jan 15 10:38:40 2012
@@ -375,8 +375,8 @@ public class DefaultCamelContext extends
answer.add(oldEndpoint);
stopServices(oldEndpoint);
} else {
- for (Map.Entry entry : endpoints.entrySet()) {
- oldEndpoint = (Endpoint)entry.getValue();
+ for (Map.Entry<EndpointKey, Endpoint> entry : endpoints.entrySet()) {
+ oldEndpoint = entry.getValue();
if (EndpointHelper.matchEndpoint(oldEndpoint.getEndpointUri(), uri)) {
answer.add(oldEndpoint);
stopServices(oldEndpoint);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultDebugger.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultDebugger.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultDebugger.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultDebugger.java Sun Jan 15 10:38:40 2012
@@ -128,15 +128,15 @@ public class DefaultDebugger implements
breakpoint.activate();
}
- public void beforeProcess(Exchange exchange, Processor processor, ProcessorDefinition definition) {
+ public void beforeProcess(Exchange exchange, Processor processor, ProcessorDefinition<?> definition) {
breakpoint.beforeProcess(exchange, processor, definition);
}
- public void afterProcess(Exchange exchange, Processor processor, ProcessorDefinition definition, long timeTaken) {
+ public void afterProcess(Exchange exchange, Processor processor, ProcessorDefinition<?> definition, long timeTaken) {
breakpoint.afterProcess(exchange, processor, definition, timeTaken);
}
- public void onEvent(Exchange exchange, EventObject event, ProcessorDefinition definition) {
+ public void onEvent(Exchange exchange, EventObject event, ProcessorDefinition<?> definition) {
if (event instanceof ExchangeCreatedEvent) {
exchange.getContext().getDebugger().startSingleStepExchange(exchange.getExchangeId(), this);
} else if (event instanceof ExchangeCompletedEvent) {
@@ -196,7 +196,7 @@ public class DefaultDebugger implements
singleSteps.remove(exchangeId);
}
- public boolean beforeProcess(Exchange exchange, Processor processor, ProcessorDefinition definition) {
+ public boolean beforeProcess(Exchange exchange, Processor processor, ProcessorDefinition<?> definition) {
// is the exchange in single step mode?
Breakpoint singleStep = singleSteps.get(exchange.getExchangeId());
if (singleStep != null) {
@@ -219,7 +219,7 @@ public class DefaultDebugger implements
return match;
}
- public boolean afterProcess(Exchange exchange, Processor processor, ProcessorDefinition definition, long timeTaken) {
+ public boolean afterProcess(Exchange exchange, Processor processor, ProcessorDefinition<?> definition, long timeTaken) {
// is the exchange in single step mode?
Breakpoint singleStep = singleSteps.get(exchange.getExchangeId());
if (singleStep != null) {
@@ -265,7 +265,7 @@ public class DefaultDebugger implements
return match;
}
- protected void onBeforeProcess(Exchange exchange, Processor processor, ProcessorDefinition definition, Breakpoint breakpoint) {
+ protected void onBeforeProcess(Exchange exchange, Processor processor, ProcessorDefinition<?> definition, Breakpoint breakpoint) {
try {
breakpoint.beforeProcess(exchange, processor, definition);
} catch (Throwable e) {
@@ -273,7 +273,7 @@ public class DefaultDebugger implements
}
}
- protected void onAfterProcess(Exchange exchange, Processor processor, ProcessorDefinition definition, long timeTaken, Breakpoint breakpoint) {
+ protected void onAfterProcess(Exchange exchange, Processor processor, ProcessorDefinition<?> definition, long timeTaken, Breakpoint breakpoint) {
try {
breakpoint.afterProcess(exchange, processor, definition, timeTaken);
} catch (Throwable e) {
@@ -282,7 +282,7 @@ public class DefaultDebugger implements
}
protected void onEvent(Exchange exchange, EventObject event, Breakpoint breakpoint) {
- ProcessorDefinition definition = null;
+ ProcessorDefinition<?> definition = null;
// try to get the last known definition
if (exchange.getUnitOfWork() != null && exchange.getUnitOfWork().getTracedRouteNodes() != null) {
@@ -299,7 +299,7 @@ public class DefaultDebugger implements
}
}
- private boolean matchConditions(Exchange exchange, Processor processor, ProcessorDefinition definition, BreakpointConditions breakpoint) {
+ private boolean matchConditions(Exchange exchange, Processor processor, ProcessorDefinition<?> definition, BreakpointConditions breakpoint) {
if (breakpoint.getConditions() != null && !breakpoint.getConditions().isEmpty()) {
for (Condition condition : breakpoint.getConditions()) {
if (!condition.matchProcess(exchange, processor, definition)) {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java Sun Jan 15 10:38:40 2012
@@ -335,7 +335,7 @@ public class DefaultExecutorServiceManag
// extract id from source
if (source instanceof NamedNode) {
- id = ((OptionalIdentifiedDefinition) source).idOrCreate(this.camelContext.getNodeIdFactory());
+ id = ((OptionalIdentifiedDefinition<?>) source).idOrCreate(this.camelContext.getNodeIdFactory());
// and let source be the short name of the pattern
sourceId = ((NamedNode) source).getShortName();
} else if (source instanceof String) {
@@ -353,7 +353,7 @@ public class DefaultExecutorServiceManag
// extract route id if possible
if (source instanceof ProcessorDefinition) {
- RouteDefinition route = ProcessorDefinitionHelper.getRoute((ProcessorDefinition) source);
+ RouteDefinition route = ProcessorDefinitionHelper.getRoute((ProcessorDefinition<?>) source);
if (route != null) {
routeId = route.idOrCreate(this.camelContext.getNodeIdFactory());
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/EventDrivenConsumerRoute.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/EventDrivenConsumerRoute.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/EventDrivenConsumerRoute.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/EventDrivenConsumerRoute.java Sun Jan 15 10:38:40 2012
@@ -81,7 +81,7 @@ public class EventDrivenConsumerRoute ex
}
if (answer instanceof Navigate) {
- return (Navigate) answer;
+ return (Navigate<Processor>) answer;
}
return null;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/RouteService.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/RouteService.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/RouteService.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/RouteService.java Sun Jan 15 10:38:40 2012
@@ -330,7 +330,7 @@ public class RouteService extends ChildS
* Gather all route scoped services from the given route, such as route scoped error handler.
*/
private void doGetRouteScopedServices(List<Service> services, Route route) {
- for (ProcessorDefinition output : route.getRouteContext().getRoute().getOutputs()) {
+ for (ProcessorDefinition<?> output : route.getRouteContext().getRoute().getOutputs()) {
if (output instanceof OnExceptionDefinition) {
OnExceptionDefinition onExceptionDefinition = (OnExceptionDefinition) output;
if (onExceptionDefinition.isRouteScoped()) {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledBatchPollingConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledBatchPollingConsumer.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledBatchPollingConsumer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledBatchPollingConsumer.java Sun Jan 15 10:38:40 2012
@@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory;
* A useful base class for any consumer which is polling batch based
*/
public abstract class ScheduledBatchPollingConsumer extends ScheduledPollConsumer implements BatchConsumer, ShutdownAware {
- private static final transient Logger log = LoggerFactory.getLogger(ScheduledBatchPollingConsumer.class);
+ private static final transient Logger LOG = LoggerFactory.getLogger(ScheduledBatchPollingConsumer.class);
protected volatile ShutdownRunningTask shutdownRunningTask;
protected volatile int pendingExchanges;
protected int maxMessagesPerPoll;
@@ -66,7 +66,7 @@ public abstract class ScheduledBatchPoll
// in the processBatch method and until an exchange gets enlisted as in-flight
// which happens later, so we need to signal back to the shutdown strategy that
// there is a pending exchange. When we are no longer polling, then we will return 0
- log.trace("Currently polling so returning 1 as pending exchanges");
+ LOG.trace("Currently polling so returning 1 as pending exchanges");
answer = 1;
}
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=1231645&r1=1231644&r2=1231645&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 Sun Jan 15 10:38:40 2012
@@ -94,8 +94,8 @@ import org.slf4j.LoggerFactory;
public class DefaultManagementLifecycleStrategy extends ServiceSupport implements LifecycleStrategy, CamelContextAware {
private static final Logger LOG = LoggerFactory.getLogger(DefaultManagementLifecycleStrategy.class);
- private final Map<Processor, KeyValueHolder<ProcessorDefinition, InstrumentationProcessor>> wrappedProcessors =
- new HashMap<Processor, KeyValueHolder<ProcessorDefinition, InstrumentationProcessor>>();
+ private final Map<Processor, KeyValueHolder<ProcessorDefinition<?>, InstrumentationProcessor>> wrappedProcessors =
+ new HashMap<Processor, KeyValueHolder<ProcessorDefinition<?>, InstrumentationProcessor>>();
private final List<PreRegisterService> preServices = new ArrayList<PreRegisterService>();
private final TimerListenerManager timerListenerManager = new TimerListenerManager();
private CamelContext camelContext;
@@ -393,7 +393,7 @@ public class DefaultManagementLifecycleS
Object answer = null;
if (service instanceof ManagementAware) {
- return ((ManagementAware) service).getManagedObject(service);
+ return ((ManagementAware<Service>) service).getManagedObject(service);
} else if (service instanceof Tracer) {
// special for tracer
Object mo = this.managedTracers.get(service);
@@ -440,7 +440,7 @@ public class DefaultManagementLifecycleS
// a bit of magic here as the processors we want to manage have already been registered
// in the wrapped processors map when Camel have instrumented the route on route initialization
// so the idea is now to only manage the processors from the map
- KeyValueHolder<ProcessorDefinition, InstrumentationProcessor> holder = wrappedProcessors.get(processor);
+ KeyValueHolder<ProcessorDefinition<?>, InstrumentationProcessor> holder = wrappedProcessors.get(processor);
if (holder == null) {
// skip as its not an well known processor we want to manage anyway, such as Channel/UnitOfWork/Pipeline etc.
return null;
@@ -583,8 +583,8 @@ public class DefaultManagementLifecycleS
// Create a map (ProcessorType -> PerformanceCounter)
// to be passed to InstrumentationInterceptStrategy.
- Map<ProcessorDefinition, PerformanceCounter> registeredCounters =
- new HashMap<ProcessorDefinition, PerformanceCounter>();
+ Map<ProcessorDefinition<?>, PerformanceCounter> registeredCounters =
+ new HashMap<ProcessorDefinition<?>, PerformanceCounter>();
// Each processor in a route will have its own performance counter.
// These performance counter will be embedded to InstrumentationProcessor
@@ -592,7 +592,7 @@ public class DefaultManagementLifecycleS
RouteDefinition route = routeContext.getRoute();
// register performance counters for all processors and its children
- for (ProcessorDefinition processor : route.getOutputs()) {
+ for (ProcessorDefinition<?> processor : route.getOutputs()) {
registerPerformanceCounters(routeContext, processor, registeredCounters);
}
@@ -601,9 +601,9 @@ public class DefaultManagementLifecycleS
routeContext.setManagedInterceptStrategy(new InstrumentationInterceptStrategy(registeredCounters, wrappedProcessors));
}
- @SuppressWarnings("unchecked")
- private void registerPerformanceCounters(RouteContext routeContext, ProcessorDefinition processor,
- Map<ProcessorDefinition, PerformanceCounter> registeredCounters) {
+ @SuppressWarnings("rawtypes")
+ private void registerPerformanceCounters(RouteContext routeContext, ProcessorDefinition<?> processor,
+ Map<ProcessorDefinition<?>, PerformanceCounter> registeredCounters) {
// traverse children if any exists
List<ProcessorDefinition> children = processor.getOutputs();
@@ -633,7 +633,7 @@ public class DefaultManagementLifecycleS
/**
* Should the given processor be registered.
*/
- protected boolean registerProcessor(ProcessorDefinition processor) {
+ protected boolean registerProcessor(ProcessorDefinition<?> processor) {
// skip on exception
if (processor instanceof OnExceptionDefinition) {
return false;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java Sun Jan 15 10:38:40 2012
@@ -157,7 +157,7 @@ public class DefaultManagementObjectStra
@SuppressWarnings({"deprecation", "unchecked"})
public Object getManagedObjectForProcessor(CamelContext context, Processor processor,
- ProcessorDefinition definition, Route route) {
+ ProcessorDefinition<?> definition, Route route) {
ManagedProcessor answer = null;
// unwrap delegates as we want the real target processor
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationInterceptStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationInterceptStrategy.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationInterceptStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationInterceptStrategy.java Sun Jan 15 10:38:40 2012
@@ -38,16 +38,16 @@ import org.apache.camel.util.KeyValueHol
*/
public class InstrumentationInterceptStrategy implements InterceptStrategy {
- private Map<ProcessorDefinition, PerformanceCounter> registeredCounters;
- private final Map<Processor, KeyValueHolder<ProcessorDefinition, InstrumentationProcessor>> wrappedProcessors;
+ private Map<ProcessorDefinition<?>, PerformanceCounter> registeredCounters;
+ private final Map<Processor, KeyValueHolder<ProcessorDefinition<?>, InstrumentationProcessor>> wrappedProcessors;
- public InstrumentationInterceptStrategy(Map<ProcessorDefinition, PerformanceCounter> registeredCounters,
- Map<Processor, KeyValueHolder<ProcessorDefinition, InstrumentationProcessor>> wrappedProcessors) {
+ public InstrumentationInterceptStrategy(Map<ProcessorDefinition<?>, PerformanceCounter> registeredCounters,
+ Map<Processor, KeyValueHolder<ProcessorDefinition<?>, InstrumentationProcessor>> wrappedProcessors) {
this.registeredCounters = registeredCounters;
this.wrappedProcessors = wrappedProcessors;
}
- public Processor wrapProcessorInInterceptors(CamelContext context, ProcessorDefinition definition,
+ public Processor wrapProcessorInInterceptors(CamelContext context, ProcessorDefinition<?> definition,
Processor target, Processor nextTarget) throws Exception {
// do not double wrap it
if (target instanceof InstrumentationProcessor) {
@@ -63,8 +63,8 @@ public class InstrumentationInterceptStr
// add it to the mapping of wrappers so we can later change it to a decorated counter
// that when we register the processor
- KeyValueHolder<ProcessorDefinition, InstrumentationProcessor> holder =
- new KeyValueHolder<ProcessorDefinition, InstrumentationProcessor>(definition, wrapper);
+ KeyValueHolder<ProcessorDefinition<?>, InstrumentationProcessor> holder =
+ new KeyValueHolder<ProcessorDefinition<?>, InstrumentationProcessor>(definition, wrapper);
wrappedProcessors.put(target, holder);
return wrapper;
}
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=1231645&r1=1231644&r2=1231645&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 Sun Jan 15 10:38:40 2012
@@ -33,7 +33,7 @@ import org.apache.camel.spi.RouteContext
*/
@XmlRootElement(name = "dynamicRouter")
@XmlAccessorType(XmlAccessType.FIELD)
-public class DynamicRouterDefinition<Type extends ProcessorDefinition> extends NoOutputExpressionNode {
+public class DynamicRouterDefinition<Type extends ProcessorDefinition<Type>> extends NoOutputExpressionNode {
public static final String DEFAULT_DELIMITER = ",";
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=1231645&r1=1231644&r2=1231645&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 Sun Jan 15 10:38:40 2012
@@ -75,7 +75,7 @@ public class InterceptDefinition extends
routeContext.getInterceptStrategies().add(new InterceptStrategy() {
private Processor interceptedTarget;
- public Processor wrapProcessorInInterceptors(CamelContext context, ProcessorDefinition definition,
+ public Processor wrapProcessorInInterceptors(CamelContext context, ProcessorDefinition<?> definition,
Processor target, Processor nextTarget) throws Exception {
// prefer next target over target as next target is the real target
interceptedTarget = nextTarget != null ? nextTarget : target;
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=1231645&r1=1231644&r2=1231645&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 Sun Jan 15 10:38:40 2012
@@ -153,7 +153,7 @@ public class InterceptSendToEndpointDefi
}
// if there is a when definition at first, then its a predicate for this interceptor
- ProcessorDefinition first = getOutputs().get(0);
+ ProcessorDefinition<?> first = getOutputs().get(0);
if (first instanceof WhenDefinition && !(first instanceof WhenSkipSendToEndpointDefinition)) {
WhenDefinition when = (WhenDefinition) first;
@@ -170,7 +170,7 @@ public class InterceptSendToEndpointDefi
// 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);
newWhen.addOutput(out);
}
// remove the moved from the original output, by just keeping the first one
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=1231645&r1=1231644&r2=1231645&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 Sun Jan 15 10:38:40 2012
@@ -24,9 +24,8 @@ import java.util.List;
*/
public abstract class NoOutputDefinition<Type extends ProcessorDefinition<Type>> extends ProcessorDefinition<Type> {
- @SuppressWarnings("unchecked")
public List<ProcessorDefinition> getOutputs() {
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
public boolean isOutputSupported() {
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=1231645&r1=1231644&r2=1231645&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 Sun Jan 15 10:38:40 2012
@@ -52,9 +52,9 @@ public class NoOutputExpressionNode exte
}
@Override
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
public List<ProcessorDefinition> getOutputs() {
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
@Override
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=1231645&r1=1231644&r2=1231645&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 Sun Jan 15 10:38:40 2012
@@ -160,7 +160,7 @@ public class OnCompletionDefinition exte
}
@Override
- public ProcessorDefinition end() {
+ public ProcessorDefinition<?> end() {
// pop parent block, as we added our self as block to parent when synchronized was defined in the route
getParent().popBlock();
return super.end();
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=1231645&r1=1231644&r2=1231645&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 Sun Jan 15 10:38:40 2012
@@ -216,7 +216,7 @@ public abstract class ProcessorDefinitio
return wrapChannel(routeContext, processor, null);
}
- protected Processor wrapChannel(RouteContext routeContext, Processor processor, ProcessorDefinition child) throws Exception {
+ protected Processor wrapChannel(RouteContext routeContext, Processor processor, ProcessorDefinition<?> child) throws Exception {
// put a channel in between this and each output to control the route flow logic
ModelChannel channel = createChannel(routeContext);
channel.setNextProcessor(processor);
@@ -227,7 +227,7 @@ public abstract class ProcessorDefinitio
addInterceptStrategies(routeContext, channel, this.getInterceptStrategies());
// must do this ugly cast to avoid compiler error on AIX/HP-UX
- ProcessorDefinition defn = (ProcessorDefinition) this;
+ ProcessorDefinition<?> defn = (ProcessorDefinition<?>) this;
// set the child before init the channel
channel.setChildDefinition(child);
@@ -259,7 +259,7 @@ public abstract class ProcessorDefinitio
} else if (defn instanceof RecipientListDefinition) {
// do not use error handler for recipient list as it offers fine grained error handlers for its outputs
// however if share unit of work is enabled, we need to wrap an error handler on the recipient list parent
- RecipientListDefinition def = (RecipientListDefinition) defn;
+ RecipientListDefinition<?> def = (RecipientListDefinition<?>) defn;
if (def.isShareUnitOfWork()) {
// note a recipient list cannot have children so no need for a child == null check
wrapChannelInErrorHandler(channel, routeContext);
@@ -428,7 +428,7 @@ public abstract class ProcessorDefinitio
resolveKnownConstantFields(this);
// also resolve properties and constant fields on embedded expressions
- ProcessorDefinition me = (ProcessorDefinition) this;
+ ProcessorDefinition<?> me = (ProcessorDefinition<?>) this;
if (me instanceof ExpressionNode) {
ExpressionNode exp = (ExpressionNode) me;
ExpressionDefinition expressionDefinition = exp.getExpression();
@@ -476,9 +476,9 @@ public abstract class ProcessorDefinitio
Map<String, Object> properties = new HashMap<String, Object>();
IntrospectionSupport.getProperties(definition, properties, null);
- ProcessorDefinition processorDefinition = null;
+ ProcessorDefinition<?> processorDefinition = null;
if (definition instanceof ProcessorDefinition) {
- processorDefinition = (ProcessorDefinition) definition;
+ processorDefinition = (ProcessorDefinition<?>) definition;
}
// include additional properties which have the Camel placeholder QName
// and when the definition parameter is this (otherAttributes belong to this)
@@ -513,9 +513,9 @@ public abstract class ProcessorDefinitio
if (!properties.isEmpty()) {
log.trace("There are {} properties on: {}", properties.size(), definition);
// lookup and resolve properties for String based properties
- for (Map.Entry entry : properties.entrySet()) {
+ for (Map.Entry<String, Object> entry : properties.entrySet()) {
// the name is always a String
- String name = (String) entry.getKey();
+ String name = entry.getKey();
Object value = entry.getValue();
if (value instanceof String) {
// value must be a String, as a String is the key for a property placeholder
@@ -594,7 +594,7 @@ public abstract class ProcessorDefinitio
*
* @param output the child to be added as output to this
*/
- protected void configureChild(ProcessorDefinition output) {
+ protected void configureChild(ProcessorDefinition<?> output) {
// noop
}
@@ -986,7 +986,7 @@ public abstract class ProcessorDefinitio
List<ProcessorDefinition> outputs = getOutputs();
if (!blocks.isEmpty()) {
if (blocks.getLast() instanceof ProcessorDefinition) {
- ProcessorDefinition block = (ProcessorDefinition)blocks.getLast();
+ ProcessorDefinition<?> block = (ProcessorDefinition<?>)blocks.getLast();
if (!block.getOutputs().isEmpty()) {
outputs = block.getOutputs();
}
@@ -1006,7 +1006,7 @@ public abstract class ProcessorDefinitio
*/
@SuppressWarnings("unchecked")
public Type routeId(String id) {
- ProcessorDefinition def = this;
+ ProcessorDefinition<?> def = this;
RouteDefinition route = ProcessorDefinitionHelper.getRoute(def);
if (route != null) {
@@ -1173,9 +1173,9 @@ public abstract class ProcessorDefinitio
*
* @return the builder
*/
- public ProcessorDefinition end() {
+ public ProcessorDefinition<?> end() {
// must do this ugly cast to avoid compiler error on AIX/HP-UX
- ProcessorDefinition defn = (ProcessorDefinition) this;
+ ProcessorDefinition<?> defn = (ProcessorDefinition<?>) this;
// when using doTry .. doCatch .. doFinally we should always
// end the try definition to avoid having to use 2 x end() in the route
@@ -1205,7 +1205,7 @@ public abstract class ProcessorDefinitio
*
* @return the end
*/
- public ProcessorDefinition endParent() {
+ public ProcessorDefinition<?> endParent() {
return this;
}
@@ -1215,7 +1215,7 @@ public abstract class ProcessorDefinitio
* @return the builder
*/
public ChoiceDefinition endChoice() {
- ProcessorDefinition def = end();
+ ProcessorDefinition<?> def = end();
if (def instanceof WhenDefinition) {
return (ChoiceDefinition) def.getParent();
} else if (def instanceof OtherwiseDefinition) {
@@ -3084,7 +3084,7 @@ public abstract class ProcessorDefinitio
setInheritErrorHandler(inheritErrorHandler);
} else {
// configure on last output as its the intended
- ProcessorDefinition output = getOutputs().get(size - 1);
+ ProcessorDefinition<?> output = getOutputs().get(size - 1);
if (output != null) {
output.setInheritErrorHandler(inheritErrorHandler);
}
@@ -3095,11 +3095,11 @@ public abstract class ProcessorDefinitio
// Properties
// -------------------------------------------------------------------------
@XmlTransient
- public ProcessorDefinition getParent() {
+ public ProcessorDefinition<?> getParent() {
return parent;
}
- public void setParent(ProcessorDefinition parent) {
+ public void setParent(ProcessorDefinition<?> parent) {
this.parent = parent;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteContextRefDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteContextRefDefinition.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteContextRefDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteContextRefDefinition.java Sun Jan 15 10:38:40 2012
@@ -53,7 +53,7 @@ public class RouteContextRefDefinition {
this.ref = ref;
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({"unchecked", "rawtypes"})
public List<RouteDefinition> lookupRoutes(CamelContext camelContext) {
ObjectHelper.notNull(camelContext, "camelContext", this);
ObjectHelper.notNull(ref, "ref", this);
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=1231645&r1=1231644&r2=1231645&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 Sun Jan 15 10:38:40 2012
@@ -96,6 +96,20 @@ public class TryDefinition extends Outpu
// -------------------------------------------------------------------------
/**
+ * Handles the given exception
+ *
+ * @param exceptionType the exception
+ * @return the try builder
+ */
+ @SuppressWarnings("unchecked")
+ public TryDefinition doCatch(Class<? extends Throwable> exceptionType) {
+ // this method is introduced to avoid compiler warnings about the
+ // generic Class arrays in the case we've got only one single Class
+ // to build a TryDefinition for
+ return doCatch((Class<? extends Throwable>[])new Class[] {exceptionType});
+ }
+
+ /**
* Handles the given exception(s)
*
* @param exceptionType the exception(s)
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/WhenDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/WhenDefinition.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/WhenDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/WhenDefinition.java Sun Jan 15 10:38:40 2012
@@ -78,7 +78,7 @@ public class WhenDefinition extends Expr
}
@Override
- public ProcessorDefinition endParent() {
+ public ProcessorDefinition<?> endParent() {
// when using when in the DSL we don't want to end back to this when, but instead
// the parent of this, so return the parent
return this.getParent();
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java Sun Jan 15 10:38:40 2012
@@ -457,7 +457,7 @@ public class MulticastProcessor extends
// mark that index as timed out, which allows us to try to retrieve
// any already completed tasks in the next loop
if (completion instanceof SubmitOrderedCompletionService) {
- ((SubmitOrderedCompletionService) completion).timeoutTask();
+ ((SubmitOrderedCompletionService<?>) completion).timeoutTask();
}
} else {
// there is a result to aggregate
@@ -966,7 +966,7 @@ public class MulticastProcessor extends
// prefer to use per Exchange aggregation strategy over a global strategy
if (exchange != null) {
- Map property = exchange.getProperty(Exchange.AGGREGATION_STRATEGY, Map.class);
+ Map<?, ?> property = exchange.getProperty(Exchange.AGGREGATION_STRATEGY, Map.class);
Map<Object, AggregationStrategy> map = CastUtils.cast(property);
if (map != null) {
answer = map.get(this);
@@ -986,7 +986,7 @@ public class MulticastProcessor extends
* @param aggregationStrategy the strategy
*/
protected void setAggregationStrategyOnExchange(Exchange exchange, AggregationStrategy aggregationStrategy) {
- Map property = exchange.getProperty(Exchange.AGGREGATION_STRATEGY, Map.class);
+ Map<?, ?> property = exchange.getProperty(Exchange.AGGREGATION_STRATEGY, Map.class);
Map<Object, AggregationStrategy> map = CastUtils.cast(property);
if (map == null) {
map = new HashMap<Object, AggregationStrategy>();
@@ -1004,7 +1004,7 @@ public class MulticastProcessor extends
* @param exchange the current exchange
*/
protected void removeAggregationStrategyFromExchange(Exchange exchange) {
- Map property = exchange.getProperty(Exchange.AGGREGATION_STRATEGY, Map.class);
+ Map<?, ?> property = exchange.getProperty(Exchange.AGGREGATION_STRATEGY, Map.class);
Map<Object, AggregationStrategy> map = CastUtils.cast(property);
if (map == null) {
return;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultChannel.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultChannel.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultChannel.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultChannel.java Sun Jan 15 10:38:40 2012
@@ -156,7 +156,6 @@ public class DefaultChannel extends Serv
ServiceHelper.stopServices(output, errorHandler, routeContextProcessor);
}
- @SuppressWarnings("unchecked")
public void initChannel(ProcessorDefinition<?> outputDefinition, RouteContext routeContext) throws Exception {
this.routeContext = routeContext;
this.definition = outputDefinition;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceEventHandler.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceEventHandler.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceEventHandler.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceEventHandler.java Sun Jan 15 10:38:40 2012
@@ -70,7 +70,7 @@ public class DefaultTraceEventHandler im
}
@Override
- public void traceExchange(ProcessorDefinition node, Processor target, TraceInterceptor traceInterceptor, Exchange exchange) throws Exception {
+ public void traceExchange(ProcessorDefinition<?> node, Processor target, TraceInterceptor traceInterceptor, Exchange exchange) throws Exception {
if (tracer.getDestination() != null || tracer.getDestinationUri() != null) {
// create event exchange and add event information
@@ -123,13 +123,13 @@ public class DefaultTraceEventHandler im
}
@Override
- public Object traceExchangeIn(ProcessorDefinition node, Processor target, TraceInterceptor traceInterceptor, Exchange exchange) throws Exception {
+ public Object traceExchangeIn(ProcessorDefinition<?> node, Processor target, TraceInterceptor traceInterceptor, Exchange exchange) throws Exception {
traceExchange(node, target, traceInterceptor, exchange);
return null;
}
@Override
- public void traceExchangeOut(ProcessorDefinition node, Processor target, TraceInterceptor traceInterceptor, Exchange exchange, Object traceState) throws Exception {
+ public void traceExchangeOut(ProcessorDefinition<?> node, Processor target, TraceInterceptor traceInterceptor, Exchange exchange, Object traceState) throws Exception {
traceExchange(node, target, traceInterceptor, exchange);
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceInterceptorFactory.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceInterceptorFactory.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceInterceptorFactory.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultTraceInterceptorFactory.java Sun Jan 15 10:38:40 2012
@@ -21,7 +21,7 @@ import org.apache.camel.model.ProcessorD
public class DefaultTraceInterceptorFactory implements TraceInterceptorFactory {
- public Processor createTraceInterceptor(ProcessorDefinition node, Processor target, TraceFormatter formatter, Tracer tracer) {
+ public Processor createTraceInterceptor(ProcessorDefinition<?> node, Processor target, TraceFormatter formatter, Tracer tracer) {
return new TraceInterceptor(node, target, formatter, tracer);
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceEventHandler.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceEventHandler.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceEventHandler.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceEventHandler.java Sun Jan 15 10:38:40 2012
@@ -39,7 +39,7 @@ public interface TraceEventHandler {
* @param exchange the current exchange
* @throws Exception is thrown if an error occurred during tracing
*/
- void traceExchange(ProcessorDefinition node, Processor target, TraceInterceptor traceInterceptor, Exchange exchange) throws Exception;
+ void traceExchange(ProcessorDefinition<?> node, Processor target, TraceInterceptor traceInterceptor, Exchange exchange) throws Exception;
/**
* Event called when an {@link Exchange} is about to be processed (in)
@@ -53,7 +53,7 @@ public interface TraceEventHandler {
* @return an optional return object to pass in the <tt>traceEventOut</tt> method.
* @throws Exception is thrown if an error occurred during tracing
*/
- Object traceExchangeIn(ProcessorDefinition node, Processor target, TraceInterceptor traceInterceptor, Exchange exchange) throws Exception;
+ Object traceExchangeIn(ProcessorDefinition<?> node, Processor target, TraceInterceptor traceInterceptor, Exchange exchange) throws Exception;
/**
* Event called when an {@link Exchange} has been processed (out)
@@ -67,6 +67,6 @@ public interface TraceEventHandler {
* @param traceState the optional object which was returned from the <tt>traceEventIn</tt> method.
* @throws Exception is thrown if an error occurred during tracing
*/
- void traceExchangeOut(ProcessorDefinition node, Processor target, TraceInterceptor traceInterceptor, Exchange exchange, Object traceState) throws Exception;
+ void traceExchangeOut(ProcessorDefinition<?> node, Processor target, TraceInterceptor traceInterceptor, Exchange exchange, Object traceState) throws Exception;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptorFactory.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptorFactory.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptorFactory.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceInterceptorFactory.java Sun Jan 15 10:38:40 2012
@@ -38,6 +38,6 @@ public interface TraceInterceptorFactory
* @param tracer the tracer
* @return the created trace interceptor
*/
- Processor createTraceInterceptor(ProcessorDefinition node, Processor target, TraceFormatter formatter, Tracer tracer);
+ Processor createTraceInterceptor(ProcessorDefinition<?> node, Processor target, TraceFormatter formatter, Tracer tracer);
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/spi/Condition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/Condition.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/spi/Condition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/spi/Condition.java Sun Jan 15 10:38:40 2012
@@ -40,7 +40,7 @@ public interface Condition {
* @param definition the present location in the route where the {@link Exchange} is located at
* @return <tt>true</tt> to match, <tt>false</tt> otherwise
*/
- boolean matchProcess(Exchange exchange, Processor processor, ProcessorDefinition definition);
+ boolean matchProcess(Exchange exchange, Processor processor, ProcessorDefinition<?> definition);
/**
* Does the condition match
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/spi/Debugger.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/Debugger.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/spi/Debugger.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/spi/Debugger.java Sun Jan 15 10:38:40 2012
@@ -119,7 +119,7 @@ public interface Debugger extends Servic
* @param definition the definition of the processor
* @return <tt>true</tt> if any breakpoint was hit, <tt>false</tt> if not breakpoint was hit
*/
- boolean beforeProcess(Exchange exchange, Processor processor, ProcessorDefinition definition);
+ boolean beforeProcess(Exchange exchange, Processor processor, ProcessorDefinition<?> definition);
/**
* Callback invoked when an {@link Exchange} has been processed which allows implementators
@@ -131,7 +131,7 @@ public interface Debugger extends Servic
* @param timeTaken time in millis it took to process the {@link Exchange} - time spend in breakpoint callbacks may affect this time
* @return <tt>true</tt> if any breakpoint was hit, <tt>false</tt> if not breakpoint was hit
*/
- boolean afterProcess(Exchange exchange, Processor processor, ProcessorDefinition definition, long timeTaken);
+ boolean afterProcess(Exchange exchange, Processor processor, ProcessorDefinition<?> definition, long timeTaken);
/**
* Callback invoked when an {@link Exchange} is being processed which allows implementators
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ManagementObjectStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ManagementObjectStrategy.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ManagementObjectStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ManagementObjectStrategy.java Sun Jan 15 10:38:40 2012
@@ -50,7 +50,7 @@ public interface ManagementObjectStrateg
Object getManagedObjectForProducer(CamelContext context, Producer producer);
Object getManagedObjectForProcessor(CamelContext context, Processor processor,
- ProcessorDefinition definition, Route route);
+ ProcessorDefinition<?> definition, Route route);
Object getManagedObjectForService(CamelContext context, Service service);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/support/TimerListenerManager.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/support/TimerListenerManager.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/support/TimerListenerManager.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/support/TimerListenerManager.java Sun Jan 15 10:38:40 2012
@@ -41,7 +41,7 @@ public class TimerListenerManager extend
private static final Logger LOG = LoggerFactory.getLogger(TimerListenerManager.class);
private final Set<TimerListener> listeners = new LinkedHashSet<TimerListener>();
private ScheduledExecutorService executorService;
- private volatile ScheduledFuture task;
+ private volatile ScheduledFuture<?> task;
private long interval = 1000L;
public TimerListenerManager() {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/UnitOfWorkHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/UnitOfWorkHelper.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/UnitOfWorkHelper.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/UnitOfWorkHelper.java Sun Jan 15 10:38:40 2012
@@ -32,7 +32,6 @@ public final class UnitOfWorkHelper {
private UnitOfWorkHelper() {
}
- @SuppressWarnings("unchecked")
public static void doneSynchronizations(Exchange exchange, List<Synchronization> synchronizations, Logger log) {
boolean failed = exchange.isFailed();
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/view/GraphSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/view/GraphSupport.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/view/GraphSupport.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/view/GraphSupport.java Sun Jan 15 10:38:40 2012
@@ -100,14 +100,14 @@ public class GraphSupport {
list.add(route);
}
- protected boolean isMulticastNode(ProcessorDefinition node) {
+ protected boolean isMulticastNode(ProcessorDefinition<?> node) {
return node instanceof MulticastDefinition || node instanceof ChoiceDefinition;
}
/**
* Is the given node a pipeline
*/
- protected boolean isPipeline(ProcessorDefinition node) {
+ protected boolean isPipeline(ProcessorDefinition<?> node) {
if (node instanceof MulticastDefinition) {
return false;
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterInvalidValueTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterInvalidValueTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterInvalidValueTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterInvalidValueTest.java Sun Jan 15 10:38:40 2012
@@ -135,7 +135,7 @@ public class BeanParameterInvalidValueTe
return body;
}
- public String heads(String body, Map headers) {
+ public String heads(String body, Map<?, ?> headers) {
return headers.get("hello") + " " + body;
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterValueTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterValueTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterValueTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanParameterValueTest.java Sun Jan 15 10:38:40 2012
@@ -166,7 +166,7 @@ public class BeanParameterValueTest exte
return body;
}
- public String heads(String body, Map headers) {
+ public String heads(String body, Map<?, ?> headers) {
return headers.get("hello") + " " + body;
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersAndBodyInjectionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersAndBodyInjectionTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersAndBodyInjectionTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersAndBodyInjectionTest.java Sun Jan 15 10:38:40 2012
@@ -50,8 +50,8 @@ public class BeanWithPropertiesAndHeader
assertEquals("Should not fail", false, out.isFailed());
- Map foo = myBean.foo;
- Map bar = myBean.bar;
+ Map<?, ?> foo = myBean.foo;
+ Map<?, ?> bar = myBean.bar;
assertNotNull("myBean.foo", foo);
assertNotNull("myBean.bar", bar);
@@ -79,8 +79,8 @@ public class BeanWithPropertiesAndHeader
}
public static class MyBean {
- private Map foo;
- private Map bar;
+ private Map<?, ?> foo;
+ private Map<?, ?> bar;
private String body;
@Override
@@ -88,7 +88,7 @@ public class BeanWithPropertiesAndHeader
return "MyBean[foo: " + foo + " bar: " + bar + " body: " + body + "]";
}
- public void myMethod(@Properties Map foo, @Headers Map bar, @Body String body) {
+ public void myMethod(@Properties Map<?, ?> foo, @Headers Map<?, ?> bar, @Body String body) {
this.foo = foo;
this.bar = bar;
this.body = body;
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersInjectionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersInjectionTest.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersInjectionTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanWithPropertiesAndHeadersInjectionTest.java Sun Jan 15 10:38:40 2012
@@ -51,8 +51,8 @@ public class BeanWithPropertiesAndHeader
}
});
- Map foo = myBean.foo;
- Map bar = myBean.bar;
+ Map<?, ?> foo = myBean.foo;
+ Map<?, ?> bar = myBean.bar;
assertNotNull("myBean.foo", foo);
assertNotNull("myBean.bar", bar);
@@ -79,15 +79,15 @@ public class BeanWithPropertiesAndHeader
}
public static class MyBean {
- public Map foo;
- public Map bar;
+ public Map<?, ?> foo;
+ public Map<?, ?> bar;
@Override
public String toString() {
return "MyBean[foo: " + foo + " bar: " + bar + "]";
}
- public void myMethod(@Properties Map foo, @Headers Map bar) {
+ public void myMethod(@Properties Map<?, ?> foo, @Headers Map<?, ?> bar) {
this.foo = foo;
this.bar = bar;
LOG.info("myMethod() method called on " + this);
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/MyApplicationException.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/MyApplicationException.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/MyApplicationException.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/MyApplicationException.java Sun Jan 15 10:38:40 2012
@@ -21,6 +21,7 @@ package org.apache.camel.component.bean;
*/
public class MyApplicationException extends Exception {
+ private static final long serialVersionUID = 1L;
private final int code;
public MyApplicationException(String message, int code) {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/MyCustomException.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/MyCustomException.java?rev=1231645&r1=1231644&r2=1231645&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/MyCustomException.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/MyCustomException.java Sun Jan 15 10:38:40 2012
@@ -18,6 +18,8 @@ package org.apache.camel.component.bean;
public class MyCustomException extends Exception {
+ private static final long serialVersionUID = 1L;
+
public MyCustomException(String message) {
super(message);
}