You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2012/01/12 19:25:40 UTC
svn commit: r1230684 [1/3] - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/builder/
camel-core/src/main/java/org/apache/camel/builder/xml/
camel-core/src/main/java/org/apache/camel/component/bean/
camel-core/src/main/java/org/apache/camel/...
Author: hadrian
Date: Thu Jan 12 18:25:36 2012
New Revision: 1230684
URL: http://svn.apache.org/viewvc?rev=1230684&view=rev
Log:
CAMEL-4796. Patch applied with thanks to Babak
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/AdviceWithRouteBuilder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanConverter.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/ClassComponent.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodNotFoundException.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentResolver.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLanguageResolver.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.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/osgi/tracker/AbstractTracked.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/scan/InvertingPackageScanFilter.java
camel/trunk/camel-core/src/main/java/org/apache/camel/language/bean/BeanLanguage.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/Block.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalancerDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.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/dataformat/JibxDataFormat.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/CatchProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ErrorHandlerSupport.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/exceptionpolicy/ExceptionPolicyKey.java
camel/trunk/camel-core/src/main/java/org/apache/camel/support/DefaultTimeoutMap.java
camel/trunk/camel-core/src/main/java/org/apache/camel/support/TimeoutMapEntry.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/CollectionHelper.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ValueHolder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/concurrent/SubmitOrderedCompletionService.java
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/CamelPostProcessorHelperTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultClassResolverTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultExchangeHolderTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteAddRemoveTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/model/ModelSanityCheckerTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChoiceWithTranfromTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelRedeliverWithDelayBlockingTest.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/SplitterNullBodyTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/util/CollectionHelperTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/util/IntrospectionSupportTest.java
camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEntryPollingConsumer.java
camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomPollingConsumer.java
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindyComplexKeyValuePairStandaloneTest.java
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintContainerRegistry.java
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintPropertiesParser.java
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelErrorHandlerFactoryBean.java
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelProxyFactoryBean.java
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/ErrorHandlerType.java
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/PackageScanRouteBuilderFinder.java
camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
camel/trunk/components/camel-castor/src/main/java/org/apache/camel/dataformat/castor/AbstractCastorDataFormat.java
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiFactoryFinder.java
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/utils/BundleContextUtils.java
camel/trunk/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/utils/BundleDelegatingClassLoader.java
camel/trunk/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/CamelMockBundle.java
camel/trunk/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/OsgiClassResolverTest.java
camel/trunk/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/OsgiFactoryFinderTest.java
camel/trunk/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/test/MockTypeConverterRegistry.java
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelProxyFactoryDefinition.java
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelServiceExporterDefinition.java
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/CamelModuleWithMatchingRoutes.java
camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaConsumer.java
camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaEndpoint.java
camel/trunk/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaProducer.java
camel/trunk/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsComponent.java
camel/trunk/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsConfiguration.java
camel/trunk/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsFileType.java
camel/trunk/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsWritableFactories.java
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/helper/HttpHelper.java
camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/helper/HttpHelperTest.java
camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/HttpHelper.java
camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/helper/HttpHelperTest.java
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
camel/trunk/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsSpringComputeTest.java
camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrConverterTest.java
camel/trunk/components/camel-jibx/src/main/java/org/apache/camel/dataformat/jibx/JibxDataFormat.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AbstractTransactionTest.java
camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiDataStoreRegistration.java
camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiEndpoint.java
camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/KratiHelper.java
camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
camel/trunk/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Helper.java
camel/trunk/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2EncodingTest.java
camel/trunk/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjComponent.java
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SOnExceptionDefinition.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/STryDefinition.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala
camel/trunk/components/camel-script/src/main/java/org/apache/camel/script/osgi/Activator.java
camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipConfiguration.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/osgi/CamelNamespaceHandler.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelRouteContextFactoryBean.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/ErrorHandlerType.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/PackageScanRouteBuilderFinder.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/BeanDefinitionParser.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParser.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/remoting/CamelProxyFactoryBean.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/util/MainRunner.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/JAXBContextResolver.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/JAXBContextResolverOSGI.java
camel/trunk/examples/camel-example-cxf-osgi/src/test/java/org/apache/camel/example/reportincident/ReportIncidentRoutesClientTest.java
camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/BankResponseAggregationStrategy.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaRouteTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFailoverRoundRobinTest.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java Thu Jan 12 18:25:36 2012
@@ -106,7 +106,7 @@ public class AdviceWithBuilder<T extends
*
* @return the builder to build the nodes.
*/
- public ProcessorDefinition replace() {
+ public ProcessorDefinition<?> replace() {
RouteDefinition route = builder.getOriginalRoute();
PipelineDefinition answer = new PipelineDefinition();
if (id != null) {
@@ -138,7 +138,7 @@ public class AdviceWithBuilder<T extends
*
* @return the builder to build the nodes.
*/
- public ProcessorDefinition before() {
+ public ProcessorDefinition<?> before() {
RouteDefinition route = builder.getOriginalRoute();
PipelineDefinition answer = new PipelineDefinition();
if (id != null) {
@@ -156,7 +156,7 @@ public class AdviceWithBuilder<T extends
*
* @return the builder to build the nodes.
*/
- public ProcessorDefinition after() {
+ public ProcessorDefinition<?> after() {
RouteDefinition route = builder.getOriginalRoute();
PipelineDefinition answer = new PipelineDefinition();
if (id != null) {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/AdviceWithRouteBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/AdviceWithRouteBuilder.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/AdviceWithRouteBuilder.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/AdviceWithRouteBuilder.java Thu Jan 12 18:25:36 2012
@@ -117,7 +117,7 @@ public abstract class AdviceWithRouteBui
* @return the builder
* @see org.apache.camel.util.EndpointHelper#matchPattern(String, String)
*/
- public <T extends ProcessorDefinition> AdviceWithBuilder weaveById(String pattern) {
+ public <T extends ProcessorDefinition<?>> AdviceWithBuilder<T> weaveById(String pattern) {
ObjectHelper.notNull(originalRoute, "originalRoute", this);
return new AdviceWithBuilder<T>(this, pattern, null, null);
}
@@ -131,7 +131,7 @@ public abstract class AdviceWithRouteBui
* @return the builder
* @see org.apache.camel.util.EndpointHelper#matchPattern(String, String)
*/
- public <T extends ProcessorDefinition> AdviceWithBuilder weaveByToString(String pattern) {
+ public <T extends ProcessorDefinition<?>> AdviceWithBuilder<T> weaveByToString(String pattern) {
ObjectHelper.notNull(originalRoute, "originalRoute", this);
return new AdviceWithBuilder<T>(this, null, pattern, null);
}
@@ -142,7 +142,7 @@ public abstract class AdviceWithRouteBui
* @param type the processor type
* @return the builder
*/
- public <T extends ProcessorDefinition> AdviceWithBuilder weaveByType(Class<T> type) {
+ public <T extends ProcessorDefinition<?>> AdviceWithBuilder<T> weaveByType(Class<T> type) {
ObjectHelper.notNull(originalRoute, "originalRoute", this);
return new AdviceWithBuilder<T>(this, null, null, type);
}
@@ -152,7 +152,7 @@ public abstract class AdviceWithRouteBui
*
* @return the builder
*/
- public <T extends ProcessorDefinition> ProcessorDefinition weaveAddFirst() {
+ public <T extends ProcessorDefinition<?>> ProcessorDefinition<?> weaveAddFirst() {
ObjectHelper.notNull(originalRoute, "originalRoute", this);
return new AdviceWithBuilder<T>(this, "*", null, null).selectFirst().before();
}
@@ -162,7 +162,7 @@ public abstract class AdviceWithRouteBui
*
* @return the builder
*/
- public <T extends ProcessorDefinition> ProcessorDefinition weaveAddLast() {
+ public <T extends ProcessorDefinition<?>> ProcessorDefinition<?> weaveAddLast() {
ObjectHelper.notNull(originalRoute, "originalRoute", this);
return new AdviceWithBuilder<T>(this, "*", null, null).selectLast().after();
}
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=1230684&r1=1230683&r2=1230684&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 Thu Jan 12 18:25:36 2012
@@ -124,7 +124,7 @@ public final class AdviceWithTasks {
return doReplace(route, matchBy, replace, it);
}
- public static AdviceWithTask replaceByType(final RouteDefinition route, final Class type, final ProcessorDefinition replace,
+ public static AdviceWithTask replaceByType(final RouteDefinition route, final Class<?> type, final ProcessorDefinition replace,
boolean selectFirst, boolean selectLast, int selectFrom, int selectTo) {
MatchBy matchBy = new MatchByType(type);
Iterator<ProcessorDefinition> it = AdviceWithTasks.createMatchByIterator(route, matchBy, selectFirst, selectLast, selectFrom, selectTo);
@@ -174,7 +174,7 @@ public final class AdviceWithTasks {
return doRemove(route, matchBy, it);
}
- public static AdviceWithTask removeByType(final RouteDefinition route, final Class type,
+ public static AdviceWithTask removeByType(final RouteDefinition route, final Class<?> type,
boolean selectFirst, boolean selectLast, int selectFrom, int selectTo) {
MatchBy matchBy = new MatchByType(type);
Iterator<ProcessorDefinition> it = AdviceWithTasks.createMatchByIterator(route, matchBy, selectFirst, selectLast, selectFrom, selectTo);
@@ -222,7 +222,7 @@ public final class AdviceWithTasks {
return doBefore(route, matchBy, before, it);
}
- public static AdviceWithTask beforeByType(final RouteDefinition route, final Class type, final ProcessorDefinition before,
+ public static AdviceWithTask beforeByType(final RouteDefinition route, final Class<?> type, final ProcessorDefinition before,
boolean selectFirst, boolean selectLast, int selectFrom, int selectTo) {
MatchBy matchBy = new MatchByType(type);
Iterator<ProcessorDefinition> it = AdviceWithTasks.createMatchByIterator(route, matchBy, selectFirst, selectLast, selectFrom, selectTo);
@@ -272,7 +272,7 @@ public final class AdviceWithTasks {
return doAfter(route, matchBy, after, it);
}
- public static AdviceWithTask afterByType(final RouteDefinition route, final Class type, final ProcessorDefinition after,
+ public static AdviceWithTask afterByType(final RouteDefinition route, final Class<?> type, final ProcessorDefinition after,
boolean selectFirst, boolean selectLast, int selectFrom, int selectTo) {
MatchBy matchBy = new MatchByType(type);
Iterator<ProcessorDefinition> it = AdviceWithTasks.createMatchByIterator(route, matchBy, selectFirst, selectLast, selectFrom, selectTo);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java Thu Jan 12 18:25:36 2012
@@ -220,7 +220,7 @@ public class DataFormatClause<T extends
/**
* Uses the JiBX data format with unmarshall class.
*/
- public T jibx(Class unmarshallClass) {
+ public T jibx(Class<?> unmarshallClass) {
return dataFormat(new JibxDataFormat(unmarshallClass));
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java Thu Jan 12 18:25:36 2012
@@ -144,9 +144,8 @@ public final class ExpressionBuilder {
*/
public static Expression headerExpression(final String headerName, final String name) {
return new ExpressionAdapter() {
- @SuppressWarnings("unchecked")
public Object evaluate(Exchange exchange) {
- Class type;
+ Class<?> type;
try {
type = exchange.getContext().getClassResolver().resolveMandatoryClass(name);
} catch (ClassNotFoundException e) {
@@ -714,9 +713,8 @@ public final class ExpressionBuilder {
*/
public static Expression bodyExpression(final String name) {
return new ExpressionAdapter() {
- @SuppressWarnings("unchecked")
public Object evaluate(Exchange exchange) {
- Class type;
+ Class<?> type;
try {
type = exchange.getContext().getClassResolver().resolveMandatoryClass(name);
} catch (ClassNotFoundException e) {
@@ -738,9 +736,8 @@ public final class ExpressionBuilder {
*/
public static Expression mandatoryBodyExpression(final String name) {
return new ExpressionAdapter() {
- @SuppressWarnings("unchecked")
public Object evaluate(Exchange exchange) {
- Class type;
+ Class<?> type;
try {
type = exchange.getContext().getClassResolver().resolveMandatoryClass(name);
} catch (ClassNotFoundException e) {
@@ -964,8 +961,7 @@ public final class ExpressionBuilder {
/**
* Returns an expression which converts the given expression to the given type
*/
- @SuppressWarnings("unchecked")
- public static Expression convertToExpression(final Expression expression, final Class type) {
+ public static Expression convertToExpression(final Expression expression, final Class<?> type) {
return new ExpressionAdapter() {
public Object evaluate(Exchange exchange) {
if (type != null) {
@@ -1087,11 +1083,11 @@ public final class ExpressionBuilder {
* <p/>
* The expression is evaluted as a {@link List} object to allow sorting.
*/
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({"unchecked", "rawtypes"})
public static Expression sortExpression(final Expression expression, final Comparator comparator) {
return new ExpressionAdapter() {
public Object evaluate(Exchange exchange) {
- List list = expression.evaluate(exchange, List.class);
+ List<?> list = expression.evaluate(exchange, List.class);
Collections.sort(list, comparator);
return list;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java Thu Jan 12 18:25:36 2012
@@ -104,7 +104,7 @@ public class ExpressionClause<T> extends
/**
* An expression of an outbound message body converted to the expected type
*/
- public T outBody(Class expectedType) {
+ public T outBody(Class<?> expectedType) {
return delegate.outBody(expectedType);
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java Thu Jan 12 18:25:36 2012
@@ -117,8 +117,7 @@ public class ExpressionClauseSupport<T>
/**
* An expression of an inbound message body converted to the expected type
*/
- @SuppressWarnings("unchecked")
- public T body(Class expectedType) {
+ public T body(Class<?> expectedType) {
return expression(ExpressionBuilder.bodyExpression(expectedType));
}
@@ -132,8 +131,7 @@ public class ExpressionClauseSupport<T>
/**
* An expression of an outbound message body converted to the expected type
*/
- @SuppressWarnings("unchecked")
- public T outBody(Class expectedType) {
+ public T outBody(Class<?> expectedType) {
return expression(ExpressionBuilder.outBodyExpression(expectedType));
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java Thu Jan 12 18:25:36 2012
@@ -210,7 +210,7 @@ public abstract class RouteBuilder exten
* @param exception exception to catch
* @return the builder
*/
- public OnExceptionDefinition onException(Class exception) {
+ public OnExceptionDefinition onException(Class<? extends Throwable> exception) {
// is only allowed at the top currently
if (!getRouteCollection().getRoutes().isEmpty()) {
throw new IllegalArgumentException("onException must be defined before any routes in the RouteBuilder");
@@ -226,9 +226,9 @@ public abstract class RouteBuilder exten
* @param exceptions list of exceptions to catch
* @return the builder
*/
- public OnExceptionDefinition onException(Class... exceptions) {
+ public OnExceptionDefinition onException(Class<? extends Throwable>... exceptions) {
OnExceptionDefinition last = null;
- for (Class ex : exceptions) {
+ for (Class<? extends Throwable> ex : exceptions) {
last = last == null ? onException(ex) : last.onException(ex);
}
return last != null ? last : onException(Exception.class);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java Thu Jan 12 18:25:36 2012
@@ -477,6 +477,7 @@ public class XPathBuilder implements Exp
public XPathFunction getBodyFunction() {
if (bodyFunction == null) {
bodyFunction = new XPathFunction() {
+ @SuppressWarnings("rawtypes")
public Object evaluate(List list) throws XPathFunctionException {
if (exchange == null) {
return null;
@@ -495,6 +496,7 @@ public class XPathBuilder implements Exp
public XPathFunction getHeaderFunction() {
if (headerFunction == null) {
headerFunction = new XPathFunction() {
+ @SuppressWarnings("rawtypes")
public Object evaluate(List list) throws XPathFunctionException {
if (exchange != null && !list.isEmpty()) {
Object value = list.get(0);
@@ -517,6 +519,7 @@ public class XPathBuilder implements Exp
public XPathFunction getOutBodyFunction() {
if (outBodyFunction == null) {
outBodyFunction = new XPathFunction() {
+ @SuppressWarnings("rawtypes")
public Object evaluate(List list) throws XPathFunctionException {
if (exchange.get() != null && exchange.get().hasOut()) {
return exchange.get().getOut().getBody();
@@ -535,6 +538,7 @@ public class XPathBuilder implements Exp
public XPathFunction getOutHeaderFunction() {
if (outHeaderFunction == null) {
outHeaderFunction = new XPathFunction() {
+ @SuppressWarnings("rawtypes")
public Object evaluate(List list) throws XPathFunctionException {
if (exchange.get() != null && !list.isEmpty()) {
Object value = list.get(0);
@@ -557,6 +561,7 @@ public class XPathBuilder implements Exp
public XPathFunction getPropertiesFunction() {
if (propertiesFunction == null) {
propertiesFunction = new XPathFunction() {
+ @SuppressWarnings("rawtypes")
public Object evaluate(List list) throws XPathFunctionException {
if (exchange != null && !list.isEmpty()) {
Object value = list.get(0);
@@ -585,6 +590,7 @@ public class XPathBuilder implements Exp
public XPathFunction getSimpleFunction() {
if (simpleFunction == null) {
simpleFunction = new XPathFunction() {
+ @SuppressWarnings("rawtypes")
public Object evaluate(List list) throws XPathFunctionException {
if (exchange != null && !list.isEmpty()) {
Object value = list.get(0);
@@ -917,7 +923,7 @@ public class XPathBuilder implements Exp
}
if (body instanceof WrappedFile) {
- body = ((WrappedFile) body).getFile();
+ body = ((WrappedFile<?>) body).getFile();
}
if (body instanceof File) {
// input stream is needed for File to avoid locking the file in case of errors etc
@@ -931,11 +937,10 @@ public class XPathBuilder implements Exp
/**
* Strategy method to extract the document from the exchange.
*/
- @SuppressWarnings("unchecked")
protected Object getDocument(Exchange exchange, Object body) {
Object answer = null;
- Class type = getDocumentType();
+ Class<?> type = getDocumentType();
if (type != null) {
// try to get the body as the desired type
answer = exchange.getContext().getTypeConverter().convertTo(type, exchange, body);
@@ -996,7 +1001,7 @@ public class XPathBuilder implements Exp
if (defaultXPathFactory == null) {
// read system property and see if there is a factory set
Properties properties = System.getProperties();
- for (Map.Entry prop : properties.entrySet()) {
+ for (Map.Entry<Object, Object> prop : properties.entrySet()) {
String key = (String) prop.getKey();
if (key.startsWith(XPathFactory.DEFAULT_PROPERTY_NAME)) {
String uri = ObjectHelper.after(key, ":");
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanConverter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanConverter.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanConverter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanConverter.java Thu Jan 12 18:25:36 2012
@@ -43,7 +43,7 @@ public final class BeanConverter {
return Void.TYPE;
}
- Class from = bi.getArgs()[0].getClass();
+ Class<?> from = bi.getArgs()[0].getClass();
Object body = bi.getArgs()[0];
// maybe from is already the type we want
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/ClassComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/ClassComponent.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/ClassComponent.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/ClassComponent.java Thu Jan 12 18:25:36 2012
@@ -29,14 +29,13 @@ import org.apache.camel.Processor;
*/
public class ClassComponent extends BeanComponent {
- @SuppressWarnings("unchecked")
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
BeanEndpoint endpoint = new BeanEndpoint(uri, this);
endpoint.setBeanName(remaining);
// bean name is the FQN
String name = endpoint.getBeanName();
- Class clazz = getCamelContext().getClassResolver().resolveMandatoryClass(name);
+ Class<?> clazz = getCamelContext().getClassResolver().resolveMandatoryClass(name);
// create bean
Object bean = getCamelContext().getInjector().newInstance(clazz);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodNotFoundException.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodNotFoundException.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodNotFoundException.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodNotFoundException.java Thu Jan 12 18:25:36 2012
@@ -28,7 +28,6 @@ public class MethodNotFoundException ext
private final Object bean;
private final String methodName;
- @SuppressWarnings("rawtypes")
public MethodNotFoundException(Exchange exchange, Object pojo, String methodName) {
super("Method with name: " + methodName + " not found on bean: " + pojo + " of type: " + ObjectHelper.className(pojo), exchange);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentResolver.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentResolver.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentResolver.java Thu Jan 12 18:25:36 2012
@@ -41,7 +41,6 @@ public class DefaultComponentResolver im
private static final transient Logger LOG = LoggerFactory.getLogger(DefaultComponentResolver.class);
private FactoryFinder factoryFinder;
- @SuppressWarnings("unchecked")
public Component resolveComponent(String name, CamelContext context) {
// lookup in registry first
Object bean = null;
@@ -66,7 +65,7 @@ public class DefaultComponentResolver im
}
// not in registry then use component factory
- Class type;
+ Class<?> type;
try {
type = findComponent(name, context);
if (type == null) {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLanguageResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLanguageResolver.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLanguageResolver.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultLanguageResolver.java Thu Jan 12 18:25:36 2012
@@ -40,7 +40,6 @@ public class DefaultLanguageResolver imp
protected FactoryFinder languageFactory;
protected FactoryFinder languageResolver;
- @SuppressWarnings("unchecked")
public Language resolveLanguage(String name, CamelContext context) {
// lookup in registry first
Object bean = null;
@@ -61,7 +60,7 @@ public class DefaultLanguageResolver imp
// we do not throw the exception here and try to auto create a Language from META-INF
}
- Class type = null;
+ Class<?> type = null;
try {
type = findLanguage(name, context);
} catch (NoFactoryAvailableException e) {
@@ -82,9 +81,8 @@ public class DefaultLanguageResolver imp
}
}
- @SuppressWarnings("unchecked")
protected Language noSpecificLanguageFound(String name, CamelContext context) {
- Class type = null;
+ Class<?> type = null;
try {
type = findLanguageResolver("default", context);
} catch (NoFactoryAvailableException e) {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java Thu Jan 12 18:25:36 2012
@@ -164,10 +164,9 @@ public class DefaultPackageScanClassReso
return classes;
}
- @SuppressWarnings("unchecked")
- public Set<Class<?>> findImplementations(Class parent, String... packageNames) {
+ public Set<Class<?>> findImplementations(Class<?> parent, String... packageNames) {
if (packageNames == null) {
- return Collections.EMPTY_SET;
+ return Collections.emptySet();
}
if (log.isDebugEnabled()) {
@@ -185,10 +184,9 @@ public class DefaultPackageScanClassReso
return classes;
}
- @SuppressWarnings("unchecked")
public Set<Class<?>> findByFilter(PackageScanFilter filter, String... packageNames) {
if (packageNames == null) {
- return Collections.EMPTY_SET;
+ return Collections.emptySet();
}
Set<Class<?>> classes = new LinkedHashSet<Class<?>>();
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=1230684&r1=1230683&r2=1230684&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 Thu Jan 12 18:25:36 2012
@@ -35,7 +35,6 @@ import org.apache.camel.model.OnCompleti
import org.apache.camel.model.OnExceptionDefinition;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.RouteDefinition;
-import org.apache.camel.processor.OnCompletionProcessor;
import org.apache.camel.spi.LifecycleStrategy;
import org.apache.camel.spi.RouteContext;
import org.apache.camel.spi.RoutePolicy;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/osgi/tracker/AbstractTracked.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/osgi/tracker/AbstractTracked.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/osgi/tracker/AbstractTracked.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/osgi/tracker/AbstractTracked.java Thu Jan 12 18:25:36 2012
@@ -66,7 +66,7 @@ abstract class AbstractTracked {
*
* @GuardedBy this
*/
- private final Map tracked;
+ private final Map<Object, Object> tracked;
/**
* Modification count. This field is initialized to zero and incremented by
@@ -88,7 +88,7 @@ abstract class AbstractTracked {
*
* @GuardedBy this
*/
- private final List adding;
+ private final List<Object> adding;
/**
* Initial list of items for the tracker. This is used to correctly process
@@ -104,16 +104,16 @@ abstract class AbstractTracked {
*
* @GuardedBy this
*/
- private final LinkedList initial;
+ private final LinkedList<Object> initial;
/**
* AbstractTracked constructor.
*/
AbstractTracked() {
- tracked = new HashMap();
+ tracked = new HashMap<Object, Object>();
trackingCount = 0;
- adding = new ArrayList(6);
- initial = new LinkedList();
+ adding = new ArrayList<Object>(6);
+ initial = new LinkedList<Object>();
closed = false;
}
@@ -127,7 +127,6 @@ abstract class AbstractTracked {
* entries in the list are ignored.
* @GuardedBy this
*/
- @SuppressWarnings("unchecked")
void setInitial(Object[] list) {
if (list == null) {
return;
@@ -150,7 +149,6 @@ abstract class AbstractTracked {
* be received. This method must be called from Tracker's open method while
* not synchronized on this object after the add listener call.
*/
- @SuppressWarnings("unchecked")
void trackInitial() {
while (true) {
Object item;
@@ -208,7 +206,6 @@ abstract class AbstractTracked {
* @param item Item to be tracked.
* @param related Action related object.
*/
- @SuppressWarnings("unchecked")
void track(final Object item, final Object related) {
final Object object;
synchronized (this) {
@@ -253,7 +250,6 @@ abstract class AbstractTracked {
* @param item Item to be tracked.
* @param related Action related object.
*/
- @SuppressWarnings("unchecked")
private void trackAdding(final Object item, final Object related) {
if (DEBUG) {
System.out.println("AbstractTracked.trackAdding: " + item);
@@ -383,7 +379,6 @@ abstract class AbstractTracked {
* items or a new array large enough to hold the tracked items.
* @GuardedBy this
*/
- @SuppressWarnings("unchecked")
Object[] getTracked(final Object[] list) {
return tracked.keySet().toArray(list);
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/scan/InvertingPackageScanFilter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/scan/InvertingPackageScanFilter.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/scan/InvertingPackageScanFilter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/scan/InvertingPackageScanFilter.java Thu Jan 12 18:25:36 2012
@@ -32,7 +32,7 @@ public class InvertingPackageScanFilter
this.filter = filter;
}
- public boolean matches(Class type) {
+ public boolean matches(Class<?> type) {
return !filter.matches(type);
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/language/bean/BeanLanguage.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/language/bean/BeanLanguage.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/language/bean/BeanLanguage.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/language/bean/BeanLanguage.java Thu Jan 12 18:25:36 2012
@@ -58,8 +58,7 @@ public class BeanLanguage implements Lan
* @param method optional name of method to invoke for instance to avoid ambiguity
* @return the expression
*/
- @SuppressWarnings("unchecked")
- public static Expression bean(Class beanType, String method) {
+ public static Expression bean(Class<?> beanType, String method) {
Object bean = ObjectHelper.newInstance(beanType);
return bean(bean, method);
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/Block.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/Block.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/Block.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/Block.java Thu Jan 12 18:25:36 2012
@@ -28,5 +28,5 @@ public interface Block {
*
* @param processorDefinition the processor definition
*/
- void addOutput(ProcessorDefinition processorDefinition);
+ void addOutput(ProcessorDefinition<?> processorDefinition);
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java Thu Jan 12 18:25:36 2012
@@ -33,7 +33,6 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.ExpressionBuilder;
import org.apache.camel.processor.CatchProcessor;
import org.apache.camel.spi.RouteContext;
-import org.apache.camel.util.CastUtils;
import org.apache.camel.util.ExpressionToPredicateAdapter;
/**
@@ -53,19 +52,19 @@ public class CatchDefinition extends Pro
@XmlElementRef
private List<ProcessorDefinition> outputs = new ArrayList<ProcessorDefinition>();
@XmlTransient
- private List<Class> exceptionClasses;
+ private List<Class<? extends Throwable>> exceptionClasses;
@XmlTransient
private Predicate handledPolicy;
public CatchDefinition() {
}
- public CatchDefinition(List<Class> exceptionClasses) {
+ public CatchDefinition(List<Class<? extends Throwable>> exceptionClasses) {
this.exceptionClasses = exceptionClasses;
}
- public CatchDefinition(Class exceptionType) {
- exceptionClasses = new ArrayList<Class>();
+ public CatchDefinition(Class<? extends Throwable> exceptionType) {
+ exceptionClasses = new ArrayList<Class<? extends Throwable>>();
exceptionClasses.add(exceptionType);
}
@@ -124,11 +123,11 @@ public class CatchDefinition extends Pro
return true;
}
- public List<Class> getExceptionClasses() {
+ public List<Class<? extends Throwable>> getExceptionClasses() {
return exceptionClasses;
}
- public void setExceptionClasses(List<Class> exceptionClasses) {
+ public void setExceptionClasses(List<Class<? extends Throwable>> exceptionClasses) {
this.exceptionClasses = exceptionClasses;
}
@@ -140,7 +139,7 @@ public class CatchDefinition extends Pro
* @param exceptionClasses a list of the exception classes
* @return the builder
*/
- public CatchDefinition exceptionClasses(List<Class> exceptionClasses) {
+ public CatchDefinition exceptionClasses(List<Class<? extends Throwable>> exceptionClasses) {
setExceptionClasses(exceptionClasses);
return this;
}
@@ -207,8 +206,8 @@ public class CatchDefinition extends Pro
* @param exception the exception of class
* @return the builder
*/
- public CatchDefinition exceptionClasses(Class exception) {
- List<Class> list = getExceptionClasses();
+ public CatchDefinition exceptionClasses(Class<? extends Throwable> exception) {
+ List<Class<? extends Throwable>> list = getExceptionClasses();
list.add(exception);
return this;
}
@@ -245,13 +244,13 @@ public class CatchDefinition extends Pro
this.handled = handled;
}
- protected List<Class> createExceptionClasses(CamelContext context) throws ClassNotFoundException {
+ protected List<Class<? extends Throwable>> createExceptionClasses(CamelContext context) throws ClassNotFoundException {
// must use the class resolver from CamelContext to load classes to ensure it can
// be loaded in all kind of environments such as JEE servers and OSGi etc.
List<String> list = getExceptions();
- List<Class> answer = new ArrayList<Class>(list.size());
+ List<Class<? extends Throwable>> answer = new ArrayList<Class<? extends Throwable>>(list.size());
for (String name : list) {
- Class<Exception> type = CastUtils.cast(context.getClassResolver().resolveMandatoryClass(name));
+ Class<Throwable> type = context.getClassResolver().resolveMandatoryClass(name, Throwable.class);
answer.add(type);
}
return answer;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalancerDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalancerDefinition.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalancerDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalancerDefinition.java Thu Jan 12 18:25:36 2012
@@ -96,10 +96,9 @@ public class LoadBalancerDefinition exte
/**
* Factory method to create the load balancer instance
*/
- @SuppressWarnings("unchecked")
protected LoadBalancer createLoadBalancer(RouteContext routeContext) {
if (loadBalancerTypeName != null) {
- Class type = routeContext.getCamelContext().getClassResolver().resolveClass(loadBalancerTypeName);
+ Class<?> type = routeContext.getCamelContext().getClassResolver().resolveClass(loadBalancerTypeName);
if (type == null) {
throw new IllegalArgumentException("Cannot find class: " + loadBalancerTypeName + " in the classpath");
}
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=1230684&r1=1230683&r2=1230684&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 Thu Jan 12 18:25:36 2012
@@ -34,7 +34,6 @@ import javax.xml.bind.annotation.XmlTran
import org.apache.camel.Predicate;
import org.apache.camel.Processor;
-import org.apache.camel.processor.FatalFallbackErrorHandler;
import org.apache.camel.processor.OnCompletionProcessor;
import org.apache.camel.processor.UnitOfWorkProcessor;
import org.apache.camel.spi.ExecutorServiceManager;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java Thu Jan 12 18:25:36 2012
@@ -43,7 +43,6 @@ import org.apache.camel.processor.Redeli
import org.apache.camel.spi.ClassResolver;
import org.apache.camel.spi.RouteContext;
import org.apache.camel.util.CamelContextHelper;
-import org.apache.camel.util.CastUtils;
import org.apache.camel.util.ExpressionToPredicateAdapter;
import org.apache.camel.util.ObjectHelper;
@@ -76,7 +75,7 @@ public class OnExceptionDefinition exten
@XmlElementRef
private List<ProcessorDefinition> outputs = new ArrayList<ProcessorDefinition>();
@XmlTransient
- private List<Class> exceptionClasses;
+ private List<Class<? extends Throwable>> exceptionClasses;
@XmlTransient
private Predicate handledPolicy;
@XmlTransient
@@ -94,12 +93,12 @@ public class OnExceptionDefinition exten
public OnExceptionDefinition() {
}
- public OnExceptionDefinition(List<Class> exceptionClasses) {
- this.exceptionClasses = CastUtils.cast(exceptionClasses);
+ public OnExceptionDefinition(List<Class<? extends Throwable>> exceptionClasses) {
+ this.exceptionClasses = exceptionClasses;
}
- public OnExceptionDefinition(Class exceptionType) {
- exceptionClasses = new ArrayList<Class>();
+ public OnExceptionDefinition(Class<? extends Throwable> exceptionType) {
+ exceptionClasses = new ArrayList<Class<? extends Throwable>>();
exceptionClasses.add(exceptionType);
}
@@ -224,7 +223,7 @@ public class OnExceptionDefinition exten
throw new IllegalArgumentException(this + " cannot have the inheritErrorHandler option set to true");
}
- List<Class> exceptions = getExceptionClasses();
+ List<Class<? extends Throwable>> exceptions = getExceptionClasses();
if (exceptions == null || exceptions.isEmpty()) {
throw new IllegalArgumentException("At least one exception must be configured on " + this);
}
@@ -248,7 +247,7 @@ public class OnExceptionDefinition exten
//-------------------------------------------------------------------------
@Override
- public OnExceptionDefinition onException(Class exceptionType) {
+ public OnExceptionDefinition onException(Class<? extends Throwable> exceptionType) {
getExceptionClasses().add(exceptionType);
return this;
}
@@ -735,11 +734,11 @@ public class OnExceptionDefinition exten
return true;
}
- public List<Class> getExceptionClasses() {
+ public List<Class<? extends Throwable>> getExceptionClasses() {
return exceptionClasses;
}
- public void setExceptionClasses(List<Class> exceptionClasses) {
+ public void setExceptionClasses(List<Class<? extends Throwable>> exceptionClasses) {
this.exceptionClasses = exceptionClasses;
}
@@ -876,12 +875,12 @@ public class OnExceptionDefinition exten
return redeliveryPolicy;
}
- protected List<Class> createExceptionClasses(ClassResolver resolver) throws ClassNotFoundException {
+ protected List<Class<? extends Throwable>> createExceptionClasses(ClassResolver resolver) throws ClassNotFoundException {
List<String> list = getExceptions();
- List<Class> answer = new ArrayList<Class>(list.size());
+ List<Class<? extends Throwable>> answer = new ArrayList<Class<? extends Throwable>>(list.size());
for (String name : list) {
- Class<?> type = resolver.resolveMandatoryClass(name);
- answer.add(CastUtils.cast(type, Throwable.class));
+ Class<? extends Throwable> type = resolver.resolveMandatoryClass(name, Throwable.class);
+ answer.add(type);
}
return answer;
}
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=1230684&r1=1230683&r2=1230684&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 Thu Jan 12 18:25:36 2012
@@ -473,7 +473,7 @@ public abstract class ProcessorDefinitio
log.trace("Resolving property placeholders for: {}", definition);
// find all getter/setter which we can use for property placeholders
- Map<Object, Object> properties = new HashMap<Object, Object>();
+ Map<String, Object> properties = new HashMap<String, Object>();
IntrospectionSupport.getProperties(definition, properties, null);
ProcessorDefinition processorDefinition = null;
@@ -548,14 +548,14 @@ public abstract class ProcessorDefinitio
log.trace("Resolving known fields for: {}", definition);
// find all String getter/setter
- Map<Object, Object> properties = new HashMap<Object, Object>();
+ Map<String, Object> properties = new HashMap<String, Object>();
IntrospectionSupport.getProperties(definition, properties, null);
if (!properties.isEmpty()) {
log.trace("There are {} properties on: {}", properties.size(), definition);
// lookup and resolve known constant fields 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();
Object value = entry.getValue();
@@ -2271,7 +2271,7 @@ public abstract class ProcessorDefinitio
* @param exceptionType the exception to catch
* @return the exception builder to configure
*/
- public OnExceptionDefinition onException(Class exceptionType) {
+ public OnExceptionDefinition onException(Class<? extends Throwable> exceptionType) {
OnExceptionDefinition answer = new OnExceptionDefinition(exceptionType);
addOutput(answer);
return answer;
@@ -2284,7 +2284,7 @@ public abstract class ProcessorDefinitio
* @param exceptions list of exceptions to catch
* @return the exception builder to configure
*/
- public OnExceptionDefinition onException(Class... exceptions) {
+ public OnExceptionDefinition onException(Class<? extends Throwable>... exceptions) {
OnExceptionDefinition answer = new OnExceptionDefinition(Arrays.asList(exceptions));
addOutput(answer);
return answer;
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=1230684&r1=1230683&r2=1230684&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 Thu Jan 12 18:25:36 2012
@@ -33,7 +33,6 @@ import org.apache.camel.builder.Expressi
import org.apache.camel.processor.CatchProcessor;
import org.apache.camel.processor.TryProcessor;
import org.apache.camel.spi.RouteContext;
-import org.apache.camel.util.CastUtils;
import org.apache.camel.util.ExpressionToPredicateAdapter;
/**
@@ -102,9 +101,9 @@ public class TryDefinition extends Outpu
* @param exceptionType the exception(s)
* @return the try builder
*/
- public TryDefinition doCatch(Class... exceptionType) {
+ public TryDefinition doCatch(Class<? extends Throwable>... exceptionType) {
popBlock();
- List<Class> list = CastUtils.cast(Arrays.asList(exceptionType));
+ List<Class<? extends Throwable>> list = Arrays.asList(exceptionType);
CatchDefinition answer = new CatchDefinition(list);
addOutput(answer);
pushBlock(answer);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JibxDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JibxDataFormat.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JibxDataFormat.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JibxDataFormat.java Thu Jan 12 18:25:36 2012
@@ -42,16 +42,16 @@ public class JibxDataFormat extends Data
super("jibx");
}
- public JibxDataFormat(Class unmarshallClass) {
+ public JibxDataFormat(Class<?> unmarshallClass) {
this();
setUnmarshallClass(unmarshallClass);
}
- public Class getUnmarshallClass() {
+ public Class<?> getUnmarshallClass() {
return unmarshallClass;
}
- public void setUnmarshallClass(Class unmarshallClass) {
+ public void setUnmarshallClass(Class<?> unmarshallClass) {
this.unmarshallClass = unmarshallClass;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/CatchProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/CatchProcessor.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/CatchProcessor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/CatchProcessor.java Thu Jan 12 18:25:36 2012
@@ -31,11 +31,11 @@ import org.apache.camel.util.ObjectHelpe
* @version
*/
public class CatchProcessor extends DelegateAsyncProcessor implements Traceable {
- private final List<Class> exceptions;
+ private final List<Class<? extends Throwable>> exceptions;
private final Predicate onWhen;
private final Predicate handled;
- public CatchProcessor(List<Class> exceptions, Processor processor, Predicate onWhen, Predicate handled) {
+ public CatchProcessor(List<Class<? extends Throwable>> exceptions, Processor processor, Predicate onWhen, Predicate handled) {
super(processor);
this.exceptions = exceptions;
this.onWhen = onWhen;
@@ -95,7 +95,7 @@ public class CatchProcessor extends Dele
return handled.matches(exchange);
}
- public List<Class> getExceptions() {
+ public List<Class<? extends Throwable>> getExceptions() {
return exceptions;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ErrorHandlerSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ErrorHandlerSupport.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ErrorHandlerSupport.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ErrorHandlerSupport.java Thu Jan 12 18:25:36 2012
@@ -54,8 +54,8 @@ public abstract class ErrorHandlerSuppor
}
}
- List<Class> list = exceptionType.getExceptionClasses();
- for (Class clazz : list) {
+ List<Class<? extends Throwable>> list = exceptionType.getExceptionClasses();
+ for (Class<? extends Throwable> clazz : list) {
String routeId = null;
// only get the route id, if the exception type is route scoped
if (exceptionType.isRouteScoped()) {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/exceptionpolicy/ExceptionPolicyKey.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/exceptionpolicy/ExceptionPolicyKey.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/exceptionpolicy/ExceptionPolicyKey.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/exceptionpolicy/ExceptionPolicyKey.java Thu Jan 12 18:25:36 2012
@@ -27,14 +27,14 @@ import org.apache.camel.model.WhenDefini
public final class ExceptionPolicyKey {
private final String routeId;
- private final Class exceptionClass;
+ private final Class<? extends Throwable> exceptionClass;
private final WhenDefinition when;
/**
* @deprecated will be removed in the near future, use the other constructor
*/
@Deprecated
- public ExceptionPolicyKey(Class exceptionClass, WhenDefinition when) {
+ public ExceptionPolicyKey(Class<? extends Throwable> exceptionClass, WhenDefinition when) {
this(null, exceptionClass, when);
}
@@ -45,7 +45,7 @@ public final class ExceptionPolicyKey {
* @param exceptionClass the exception class
* @param when optional predicate when the exception clause should trigger
*/
- public ExceptionPolicyKey(String routeId, Class exceptionClass, WhenDefinition when) {
+ public ExceptionPolicyKey(String routeId, Class<? extends Throwable> exceptionClass, WhenDefinition when) {
this.routeId = routeId;
this.exceptionClass = exceptionClass;
this.when = when;
@@ -67,7 +67,7 @@ public final class ExceptionPolicyKey {
* @deprecated will be removed in the near future. Use the constructor instead.
*/
@Deprecated
- public static ExceptionPolicyKey newInstance(Class exceptionClass) {
+ public static ExceptionPolicyKey newInstance(Class<? extends Throwable> exceptionClass) {
return new ExceptionPolicyKey(exceptionClass, null);
}
@@ -75,7 +75,7 @@ public final class ExceptionPolicyKey {
* @deprecated will be removed in the near future. Use the constructor instead.
*/
@Deprecated
- public static ExceptionPolicyKey newInstance(Class exceptionClass, WhenDefinition when) {
+ public static ExceptionPolicyKey newInstance(Class<? extends Throwable> exceptionClass, WhenDefinition when) {
return new ExceptionPolicyKey(exceptionClass, when);
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/support/DefaultTimeoutMap.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/support/DefaultTimeoutMap.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/support/DefaultTimeoutMap.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/support/DefaultTimeoutMap.java Thu Jan 12 18:25:36 2012
@@ -252,7 +252,7 @@ public class DefaultTimeoutMap<K, V> ext
return true;
}
- protected void updateExpireTime(TimeoutMapEntry entry) {
+ protected void updateExpireTime(TimeoutMapEntry<K, V> entry) {
long now = currentTime();
entry.setExpireTime(entry.getTimeout() + now);
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/support/TimeoutMapEntry.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/support/TimeoutMapEntry.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/support/TimeoutMapEntry.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/support/TimeoutMapEntry.java Thu Jan 12 18:25:36 2012
@@ -73,7 +73,7 @@ public class TimeoutMapEntry<K, V> imple
return 0;
}
if (that instanceof TimeoutMapEntry) {
- return compareTo((TimeoutMapEntry) that);
+ return compareTo((TimeoutMapEntry<K, V>) that);
}
return 1;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/CollectionHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/CollectionHelper.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/CollectionHelper.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/CollectionHelper.java Thu Jan 12 18:25:36 2012
@@ -78,14 +78,14 @@ public final class CollectionHelper {
* @param value the value to put in the map
*/
@SuppressWarnings("unchecked")
- public static void appendValue(Map map, Object key, Object value) {
+ public static void appendValue(Map<String, Object> map, String key, Object value) {
Object oldValue = map.get(key);
if (oldValue != null) {
- List list;
+ List<Object> list;
if (oldValue instanceof List) {
- list = (List)oldValue;
+ list = (List<Object>)oldValue;
} else {
- list = new ArrayList();
+ list = new ArrayList<Object>();
list.add(oldValue);
// replace old entry with list
map.remove(key);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java Thu Jan 12 18:25:36 2012
@@ -137,8 +137,7 @@ public final class IntrospectionSupport
* @param optionPrefix an optional prefix to append the property key
* @return <tt>true</tt> if any properties was found, <tt>false</tt> otherwise.
*/
- @SuppressWarnings("unchecked")
- public static boolean getProperties(Object target, Map properties, String optionPrefix) {
+ public static boolean getProperties(Object target, Map<String, Object> properties, String optionPrefix) {
ObjectHelper.notNull(target, "target");
ObjectHelper.notNull(properties, "properties");
boolean rc = false;
@@ -146,7 +145,7 @@ public final class IntrospectionSupport
optionPrefix = "";
}
- Class clazz = target.getClass();
+ Class<?> clazz = target.getClass();
Method[] methods = clazz.getMethods();
for (Method method : methods) {
if (EXCLUDED_METHODS.contains(method)) {
@@ -171,7 +170,7 @@ public final class IntrospectionSupport
public static boolean hasSetter(Object target, Method getter) {
String name = getGetterShorthandName(getter);
- Class clazz = target.getClass();
+ Class<?> clazz = target.getClass();
Method[] methods = clazz.getMethods();
for (Method method : methods) {
if (EXCLUDED_METHODS.contains(method)) {
@@ -377,8 +376,7 @@ public final class IntrospectionSupport
return setProperty(target, name, value, false);
}
- @SuppressWarnings("unchecked")
- private static Object convert(TypeConverter typeConverter, Class type, Object value)
+ private static Object convert(TypeConverter typeConverter, Class<?> type, Object value)
throws URISyntaxException, NoTypeConversionAvailableException {
if (typeConverter != null) {
return typeConverter.mandatoryConvertTo(type, value);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/ValueHolder.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ValueHolder.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/ValueHolder.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/ValueHolder.java Thu Jan 12 18:25:36 2012
@@ -54,7 +54,7 @@ public class ValueHolder<V> {
return false;
}
- ValueHolder that = (ValueHolder) o;
+ ValueHolder<?> that = (ValueHolder<?>) o;
if (value != null ? !value.equals(that.value) : that.value != null) {
return false;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/concurrent/SubmitOrderedCompletionService.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/concurrent/SubmitOrderedCompletionService.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/concurrent/SubmitOrderedCompletionService.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/concurrent/SubmitOrderedCompletionService.java Thu Jan 12 18:25:36 2012
@@ -89,8 +89,7 @@ public class SubmitOrderedCompletionServ
this.executor = executor;
}
- @SuppressWarnings("unchecked")
- public Future<V> submit(Callable task) {
+ public Future<V> submit(Callable<V> task) {
if (task == null) {
throw new IllegalArgumentException("Task must be provided");
}
@@ -113,10 +112,9 @@ public class SubmitOrderedCompletionServ
return completionQueue.take();
}
- @SuppressWarnings("unchecked")
public Future<V> poll() {
index.incrementAndGet();
- Future answer = completionQueue.poll();
+ Future<V> answer = completionQueue.poll();
if (answer == null) {
// decrease counter if we didnt get any data
index.decrementAndGet();
@@ -124,10 +122,9 @@ public class SubmitOrderedCompletionServ
return answer;
}
- @SuppressWarnings("unchecked")
public Future<V> poll(long timeout, TimeUnit unit) throws InterruptedException {
index.incrementAndGet();
- Future answer = completionQueue.poll(timeout, unit);
+ Future<V> answer = completionQueue.poll(timeout, unit);
if (answer == null) {
// decrease counter if we didnt get any data
index.decrementAndGet();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/impl/CamelPostProcessorHelperTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/CamelPostProcessorHelperTest.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/impl/CamelPostProcessorHelperTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/impl/CamelPostProcessorHelperTest.java Thu Jan 12 18:25:36 2012
@@ -122,7 +122,7 @@ public class CamelPostProcessorHelperTes
EndpointInject endpointInject = method.getAnnotation(EndpointInject.class);
Class<?>[] parameterTypes = method.getParameterTypes();
- for (Class type : parameterTypes) {
+ for (Class<?> type : parameterTypes) {
String propertyName = ObjectHelper.getPropertyName(method);
Object value = helper.getInjectionValue(type, endpointInject.uri(), endpointInject.ref(), propertyName, bean, "foo");
ObjectHelper.invokeMethod(method, bean, value);
@@ -145,7 +145,7 @@ public class CamelPostProcessorHelperTes
EndpointInject endpointInject = method.getAnnotation(EndpointInject.class);
Class<?>[] parameterTypes = method.getParameterTypes();
- for (Class type : parameterTypes) {
+ for (Class<?> type : parameterTypes) {
String propertyName = ObjectHelper.getPropertyName(method);
Object value = helper.getInjectionValue(type, endpointInject.uri(), endpointInject.ref(), propertyName, bean, "foo");
ObjectHelper.invokeMethod(method, bean, value);
@@ -172,7 +172,7 @@ public class CamelPostProcessorHelperTes
EndpointInject endpointInject = method.getAnnotation(EndpointInject.class);
Class<?>[] parameterTypes = method.getParameterTypes();
- for (Class type : parameterTypes) {
+ for (Class<?> type : parameterTypes) {
String propertyName = ObjectHelper.getPropertyName(method);
Object value = helper.getInjectionValue(type, endpointInject.uri(), endpointInject.ref(), propertyName, bean, "foo");
ObjectHelper.invokeMethod(method, bean, value);
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultClassResolverTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultClassResolverTest.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultClassResolverTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultClassResolverTest.java Thu Jan 12 18:25:36 2012
@@ -28,7 +28,7 @@ public class DefaultClassResolverTest ex
public void testResolveClass() {
DefaultClassResolver resolver = new DefaultClassResolver();
- Class clazz = resolver.resolveClass("java.lang.Integer");
+ Class<?> clazz = resolver.resolveClass("java.lang.Integer");
assertNotNull(clazz);
}
@@ -40,7 +40,7 @@ public class DefaultClassResolverTest ex
public void testResolveClassClassLoader() {
DefaultClassResolver resolver = new DefaultClassResolver();
- Class clazz = resolver.resolveClass("java.lang.Integer", DefaultClassResolverTest.class.getClassLoader());
+ Class<?> clazz = resolver.resolveClass("java.lang.Integer", DefaultClassResolverTest.class.getClassLoader());
assertNotNull(clazz);
}
@@ -52,7 +52,7 @@ public class DefaultClassResolverTest ex
public void testResolveMandatoryClass() throws Exception {
DefaultClassResolver resolver = new DefaultClassResolver();
- Class clazz = resolver.resolveMandatoryClass("java.lang.Integer");
+ Class<?> clazz = resolver.resolveMandatoryClass("java.lang.Integer");
assertNotNull(clazz);
}
@@ -64,7 +64,7 @@ public class DefaultClassResolverTest ex
public void testResolveMandatoryClassClassLoader() throws Exception {
DefaultClassResolver resolver = new DefaultClassResolver();
- Class clazz = resolver.resolveMandatoryClass("java.lang.Integer", DefaultClassResolverTest.class.getClassLoader());
+ Class<?> clazz = resolver.resolveMandatoryClass("java.lang.Integer", DefaultClassResolverTest.class.getClassLoader());
assertNotNull(clazz);
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultExchangeHolderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultExchangeHolderTest.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultExchangeHolderTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultExchangeHolderTest.java Thu Jan 12 18:25:36 2012
@@ -81,10 +81,9 @@ public class DefaultExchangeHolderTest e
assertNull(exchange.getIn().getHeader("Foo"));
}
- @SuppressWarnings("unchecked")
public void testSkipNonSerializableDataFromList() throws Exception {
// use a mixed list, the MyFoo is not serializable so the entire list should be skipped
- List list = new ArrayList();
+ List<Object> list = new ArrayList<Object>();
list.add("I am okay");
list.add(new MyFoo("Tiger"));
@@ -104,10 +103,9 @@ public class DefaultExchangeHolderTest e
assertNull(exchange.getIn().getHeader("Foo"));
}
- @SuppressWarnings("unchecked")
public void testSkipNonSerializableDataFromMap() throws Exception {
// use a mixed Map, the MyFoo is not serializable so the entire map should be skipped
- Map map = new HashMap();
+ Map<String, Object> map = new HashMap<String, Object>();
map.put("A", "I am okay");
map.put("B", new MyFoo("Tiger"));
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java Thu Jan 12 18:25:36 2012
@@ -19,7 +19,6 @@ package org.apache.camel.management;
import java.io.IOException;
import java.lang.management.ManagementFactory;
import java.util.Iterator;
-import java.util.List;
import java.util.Set;
import javax.management.MBeanServer;
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteAddRemoveTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteAddRemoveTest.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteAddRemoveTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteAddRemoveTest.java Thu Jan 12 18:25:36 2012
@@ -218,7 +218,7 @@ public class ManagedRouteAddRemoveTest e
getMockEndpoint("mock:bar").expectedMessageCount(1);
getMockEndpoint("mock:error").expectedMessageCount(1);
- Map headers = new HashMap();
+ Map<String, Object> headers = new HashMap<String, Object>();
headers.put("error", "mock:error");
headers.put("bar", "mock:bar");
template.sendBodyAndHeaders("direct:bar", "Hello World", headers);
@@ -278,7 +278,7 @@ public class ManagedRouteAddRemoveTest e
getMockEndpoint("mock:bar").expectedMessageCount(1);
getMockEndpoint("mock:error").expectedMessageCount(1);
- Map headers = new HashMap();
+ Map<String, Object> headers = new HashMap<String, Object>();
headers.put("error", "mock:error");
headers.put("bar", "mock:bar");
template.sendBodyAndHeaders("direct:bar", "Hello World", headers);
@@ -336,7 +336,7 @@ public class ManagedRouteAddRemoveTest e
getMockEndpoint("mock:bar").expectedMessageCount(1);
getMockEndpoint("mock:done").expectedMessageCount(1);
- Map headers = new HashMap();
+ Map<String, Object> headers = new HashMap<String, Object>();
headers.put("done", "mock:done");
headers.put("bar", "mock:bar");
template.sendBodyAndHeaders("direct:bar", "Hello World", headers);
@@ -395,7 +395,7 @@ public class ManagedRouteAddRemoveTest e
getMockEndpoint("mock:bar").expectedMessageCount(1);
getMockEndpoint("mock:done").expectedMessageCount(1);
- Map headers = new HashMap();
+ Map<String, Object> headers = new HashMap<String, Object>();
headers.put("done", "mock:done");
headers.put("bar", "mock:bar");
template.sendBodyAndHeaders("direct:bar", "Hello World", headers);
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/model/ModelSanityCheckerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/model/ModelSanityCheckerTest.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/model/ModelSanityCheckerTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/model/ModelSanityCheckerTest.java Thu Jan 12 18:25:36 2012
@@ -50,7 +50,7 @@ public class ModelSanityCheckerTest exte
assertTrue("There should be > 140 classes, was: " + classes.size(), classes.size() > 140);
// check each class is okay
- for (Class clazz : classes) {
+ for (Class<?> clazz : classes) {
// skip ProcessorDefinition as its special
if (clazz == ProcessorDefinition.class) {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChoiceWithTranfromTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChoiceWithTranfromTest.java?rev=1230684&r1=1230683&r2=1230684&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChoiceWithTranfromTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChoiceWithTranfromTest.java Thu Jan 12 18:25:36 2012
@@ -19,7 +19,6 @@ package org.apache.camel.processor;
import org.apache.camel.Body;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.processor.ChoiceWhenBeanExpressionTest.Student;
public class ChoiceWithTranfromTest extends ContextTestSupport {