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 2011/12/12 09:57:07 UTC
svn commit: r1213169 [3/3] - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/component/xslt/
camel-core/src/test/java/org/apache/camel/component/bean/pojomessage/
camel-core/src/test/java/org/apache/camel/component/xslt/
camel-core/src/test/...
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/scan/SpringComponentScanWithDeprecatedPackagesTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/scan/SpringComponentScanWithDeprecatedPackagesTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/scan/SpringComponentScanWithDeprecatedPackagesTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/scan/SpringComponentScanWithDeprecatedPackagesTest.java Mon Dec 12 08:57:03 2011
@@ -17,7 +17,6 @@
package org.apache.camel.spring.config.scan;
-import org.apache.camel.CamelContext;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.model.ModelCamelContext;
@@ -30,7 +29,7 @@ public class SpringComponentScanWithDepr
protected void setUp() throws Exception {
super.setUp();
ApplicationContext c = new ClassPathXmlApplicationContext("org/apache/camel/spring/config/scan/componentScanWithPackages.xml");
- context = (ModelCamelContext)c.getBean("camelContext");
+ context = c.getBean("camelContext", ModelCamelContext.class);
template = context.createProducerTemplate();
template.start();
}
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/PojoDualCamelContextConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/PojoDualCamelContextConsumerTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/PojoDualCamelContextConsumerTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/PojoDualCamelContextConsumerTest.java Mon Dec 12 08:57:03 2011
@@ -99,8 +99,8 @@ public class PojoDualCamelContextConsume
super.setUp();
ac = new ClassPathXmlApplicationContext("org/apache/camel/spring/example/pojoDualCamelContextConsumer.xml");
- camel1 = (CamelContext) ac.getBean("camel-1");
- camel2 = (CamelContext) ac.getBean("camel-2");
+ camel1 = ac.getBean("camel-1", CamelContext.class);
+ camel2 = ac.getBean("camel-2", CamelContext.class);
}
@Override
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParserTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParserTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParserTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParserTest.java Mon Dec 12 08:57:03 2011
@@ -38,14 +38,14 @@ public class ErrorHandlerDefinitionParse
}
public void testLoggingErrorHandler() {
- LoggingErrorHandlerBuilder errorHandler = (LoggingErrorHandlerBuilder) ctx.getBean("loggingErrorHandler");
+ LoggingErrorHandlerBuilder errorHandler = ctx.getBean("loggingErrorHandler", LoggingErrorHandlerBuilder.class);
assertNotNull(errorHandler);
assertEquals("The log level should be INFO", LoggingLevel.INFO, errorHandler.getLevel());
assertEquals("The log name should be foo", "foo", errorHandler.getLogName());
}
public void testDefaultErrorHandler() {
- DefaultErrorHandlerBuilder errorHandler = (DefaultErrorHandlerBuilder) ctx.getBean("defaultErrorHandler");
+ DefaultErrorHandlerBuilder errorHandler = ctx.getBean("defaultErrorHandler", DefaultErrorHandlerBuilder.class);
assertNotNull(errorHandler);
RedeliveryPolicy policy = errorHandler.getRedeliveryPolicy();
assertNotNull(policy);
@@ -53,12 +53,12 @@ public class ErrorHandlerDefinitionParse
assertEquals("Wrong redeliveryDelay", 0, policy.getRedeliveryDelay());
assertEquals("Wrong logStackTrace", false, policy.isLogStackTrace());
- errorHandler = (DefaultErrorHandlerBuilder) ctx.getBean("errorHandler");
+ errorHandler = ctx.getBean("errorHandler", DefaultErrorHandlerBuilder.class);
assertNotNull(errorHandler);
}
public void testTransactionErrorHandler() {
- TransactionErrorHandlerBuilder errorHandler = (TransactionErrorHandlerBuilder) ctx.getBean("transactionErrorHandler");
+ TransactionErrorHandlerBuilder errorHandler = ctx.getBean("transactionErrorHandler", TransactionErrorHandlerBuilder.class);
assertNotNull(errorHandler);
assertNotNull(errorHandler.getTransactionTemplate());
Processor processor = errorHandler.getOnRedelivery();
@@ -66,13 +66,13 @@ public class ErrorHandlerDefinitionParse
}
public void testTXErrorHandler() {
- TransactionErrorHandlerBuilder errorHandler = (TransactionErrorHandlerBuilder) ctx.getBean("txEH");
+ TransactionErrorHandlerBuilder errorHandler = ctx.getBean("txEH", TransactionErrorHandlerBuilder.class);
assertNotNull(errorHandler);
assertNotNull(errorHandler.getTransactionTemplate());
}
public void testDeadLetterErrorHandler() {
- DeadLetterChannelBuilder errorHandler = (DeadLetterChannelBuilder) ctx.getBean("deadLetterErrorHandler");
+ DeadLetterChannelBuilder errorHandler = ctx.getBean("deadLetterErrorHandler", DeadLetterChannelBuilder.class);
assertNotNull(errorHandler);
assertEquals("Get wrong deadletteruri", "log:dead", errorHandler.getDeadLetterUri());
RedeliveryPolicy policy = errorHandler.getRedeliveryPolicy();
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/ContainerWideInterceptorTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/ContainerWideInterceptorTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/ContainerWideInterceptorTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/ContainerWideInterceptorTest.java Mon Dec 12 08:57:03 2011
@@ -37,9 +37,9 @@ public class ContainerWideInterceptorTes
protected void setUp() throws Exception {
super.setUp();
ac = new ClassPathXmlApplicationContext("/org/apache/camel/spring/interceptor/ContainerWideInterceptorTest.xml");
- camel1 = (CamelContext) ac.getBean("camel1");
- camel2 = (CamelContext) ac.getBean("camel2");
- myInterceptor = (ContainerWideInterceptor) ac.getBean("myInterceptor");
+ camel1 = ac.getBean("camel1", CamelContext.class);
+ camel2 = ac.getBean("camel2", CamelContext.class);
+ myInterceptor = ac.getBean("myInterceptor", ContainerWideInterceptor.class);
}
@Override
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringTwoCamelContextDirectEndpointTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringTwoCamelContextDirectEndpointTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringTwoCamelContextDirectEndpointTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringTwoCamelContextDirectEndpointTest.java Mon Dec 12 08:57:03 2011
@@ -36,8 +36,8 @@ public class SpringTwoCamelContextDirect
AbstractXmlApplicationContext ac = createApplicationContext();
ac.start();
- CamelContext camel1 = (CamelContext) ac.getBean("camel-1", CamelContext.class);
- CamelContext camel2 = (CamelContext) ac.getBean("camel-2", CamelContext.class);
+ CamelContext camel1 = ac.getBean("camel-1", CamelContext.class);
+ CamelContext camel2 = ac.getBean("camel-2", CamelContext.class);
Endpoint start1 = camel1.getEndpoint("direct:start");
Endpoint start2 = camel2.getEndpoint("direct:start");
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/postprocessor/PlainSpringCustomPostProcessorOnRouteBuilderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/postprocessor/PlainSpringCustomPostProcessorOnRouteBuilderTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/postprocessor/PlainSpringCustomPostProcessorOnRouteBuilderTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/postprocessor/PlainSpringCustomPostProcessorOnRouteBuilderTest.java Mon Dec 12 08:57:03 2011
@@ -31,7 +31,7 @@ public class PlainSpringCustomPostProces
assertNotNull("Context not created", context);
assertNotNull("Post processor not registered", context.getBeansOfType(MagicAnnotationPostProcessor.class));
- TestPojo pojo = (TestPojo) context.getBean("testPojo");
+ TestPojo pojo = context.getBean("testPojo", TestPojo.class);
assertNotNull("Test pojo not registered", pojo);
assertEquals("Processor has not changed field value", "Changed Value", pojo.getTestValue());
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/tracing/TraceInterceptorSubclassTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/tracing/TraceInterceptorSubclassTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/tracing/TraceInterceptorSubclassTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/tracing/TraceInterceptorSubclassTest.java Mon Dec 12 08:57:03 2011
@@ -31,7 +31,7 @@ public class TraceInterceptorSubclassTes
@SuppressWarnings("unchecked")
@Override
protected List<StringBuilder> getTracedMessages() {
- return (List<StringBuilder>) this.applicationContext.getBean("eventMessages");
+ return this.applicationContext.getBean("eventMessages", List.class);
}
}
\ No newline at end of file
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/tracing/TracingTestBase.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/tracing/TracingTestBase.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/tracing/TracingTestBase.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/tracing/TracingTestBase.java Mon Dec 12 08:57:03 2011
@@ -26,7 +26,7 @@ import org.apache.camel.spring.SpringTes
public abstract class TracingTestBase extends SpringTestSupport {
protected List<StringBuilder> getTracedMessages() {
- Tracer tracer = (Tracer) this.applicationContext.getBean("tracer");
+ Tracer tracer = this.applicationContext.getBean("tracer", Tracer.class);
TraceHandlerTestHandler handler = (TraceHandlerTestHandler) tracer.getTraceHandlers().get(0);
return handler.getEventMessages();
}
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/produce/MyCoolBeanTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/produce/MyCoolBeanTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/produce/MyCoolBeanTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/produce/MyCoolBeanTest.java Mon Dec 12 08:57:03 2011
@@ -23,7 +23,7 @@ import org.springframework.test.context.
public class MyCoolBeanTest extends AbstractJUnit38SpringContextTests {
public void testProducerTemplate() throws Exception {
- MyCoolBean cool = (MyCoolBean) applicationContext.getBean("cool");
+ MyCoolBean cool = applicationContext.getBean("cool", MyCoolBean.class);
cool.sendMsg();
}
}
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/EchoSpringRemotingPojoDirectTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/EchoSpringRemotingPojoDirectTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/EchoSpringRemotingPojoDirectTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/EchoSpringRemotingPojoDirectTest.java Mon Dec 12 08:57:03 2011
@@ -54,7 +54,7 @@ public class EchoSpringRemotingPojoDirec
try {
// use the pojo directly to call the injected endpoint and have the
// original runtime exception thrown
- EchoPojoDirect echoPojoDirect = (EchoPojoDirect)applicationContext.getBean("myPojoDirect");
+ EchoPojoDirect echoPojoDirect = applicationContext.getBean("myPojoDirect", EchoPojoDirect.class);
String out = echoPojoDirect.onEcho("Kabom");
assertNotNull(out);
fail("Should have thrown exception");
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingBeanConverterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingBeanConverterTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingBeanConverterTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingBeanConverterTest.java Mon Dec 12 08:57:03 2011
@@ -32,7 +32,7 @@ public class SpringRemotingBeanConverter
CamelContext camelContext = SpringCamelContext.springCamelContext(applicationContext);
- Invoker invoker = (Invoker) applicationContext.getBean("invokerProxy");
+ Invoker invoker = applicationContext.getBean("invokerProxy", Invoker.class);
String response = invoker.invoke(new Bean.SubClass());
assertEquals("Hello from Sub" , response);
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingRouteTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingRouteTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingRouteTest.java Mon Dec 12 08:57:03 2011
@@ -32,7 +32,7 @@ public class SpringRemotingRouteTest ext
CamelContext camelContext = SpringCamelContext.springCamelContext(applicationContext);
// START SNIPPET: invoke
- ISay proxy = (ISay) applicationContext.getBean("sayProxy");
+ ISay proxy = applicationContext.getBean("sayProxy", ISay.class);
String rc = proxy.say();
assertEquals("Hello", rc);
// END SNIPPET: invoke
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/xml/SpringXmlRouteBuilderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/xml/SpringXmlRouteBuilderTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/xml/SpringXmlRouteBuilderTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/xml/SpringXmlRouteBuilderTest.java Mon Dec 12 08:57:03 2011
@@ -42,14 +42,14 @@ public class SpringXmlRouteBuilderTest e
@Override
protected List<Route> buildCustomProcessor() {
List<Route> answer = getRoutesFromContext("org/apache/camel/spring/xml/buildCustomProcessor.xml");
- myProcessor = (Processor) applicationContext.getBean("myProcessor");
+ myProcessor = applicationContext.getBean("myProcessor", Processor.class);
return answer;
}
@Override
protected List<Route> buildCustomProcessorWithFilter() {
List<Route> answer = getRoutesFromContext("org/apache/camel/spring/xml/buildCustomProcessorWithFilter.xml");
- myProcessor = (Processor) applicationContext.getBean("myProcessor");
+ myProcessor = applicationContext.getBean("myProcessor", Processor.class);
return answer;
}
@@ -100,8 +100,7 @@ public class SpringXmlRouteBuilderTest e
protected List<Route> getRoutesFromContext(String classpathConfigFile) {
applicationContext = new ClassPathXmlApplicationContext(classpathConfigFile);
- // must type cast to work with Spring 2.5.x
- SpringCamelContext context = (SpringCamelContext) applicationContext.getBeansOfType(SpringCamelContext.class).values().iterator().next();
+ SpringCamelContext context = applicationContext.getBeansOfType(SpringCamelContext.class).values().iterator().next();
assertNotNull("No Camel Context in file: " + classpathConfigFile, context);
List<Route> routes = context.getRoutes();
assertNotNull("No routes available for context: " + context.getName() + " in file: " + classpathConfigFile, routes);
Modified: camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelSpringTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelSpringTestSupport.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelSpringTestSupport.java (original)
+++ camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelSpringTestSupport.java Mon Dec 12 08:57:03 2011
@@ -102,7 +102,7 @@ public abstract class CamelSpringTestSup
routeExcludingContext.registerBeanDefinition("excludingResolver", new RootBeanDefinition(ExcludingPackageScanClassResolver.class));
routeExcludingContext.refresh();
- ExcludingPackageScanClassResolver excludingResolver = (ExcludingPackageScanClassResolver)routeExcludingContext.getBean("excludingResolver");
+ ExcludingPackageScanClassResolver excludingResolver = routeExcludingContext.getBean("excludingResolver", ExcludingPackageScanClassResolver.class);
List<Class<?>> excluded = CastUtils.cast(Arrays.asList(excludeRoutes()));
excludingResolver.setExcludedClasses(new HashSet<Class<?>>(excluded));
@@ -132,14 +132,7 @@ public abstract class CamelSpringTestSup
* it is not present or the correct type
*/
public <T> T getMandatoryBean(Class<T> type, String name) {
- Object value = applicationContext.getBean(name);
- assertNotNull("No spring bean found for name <" + name + ">", value);
- if (type.isInstance(value)) {
- return type.cast(value);
- } else {
- fail("Spring bean <" + name + "> is not an instanceof " + type.getName() + " but is of type " + ObjectHelper.className(value));
- return null;
- }
+ return applicationContext.getBean(name, type);
}
@Override
Modified: camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelSpringTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelSpringTestSupport.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelSpringTestSupport.java (original)
+++ camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelSpringTestSupport.java Mon Dec 12 08:57:03 2011
@@ -142,7 +142,7 @@ public abstract class CamelSpringTestSup
routeExcludingContext.registerBeanDefinition("excludingResolver", new RootBeanDefinition(ExcludingPackageScanClassResolver.class));
routeExcludingContext.refresh();
- ExcludingPackageScanClassResolver excludingResolver = (ExcludingPackageScanClassResolver)routeExcludingContext.getBean("excludingResolver");
+ ExcludingPackageScanClassResolver excludingResolver = routeExcludingContext.getBean("excludingResolver", ExcludingPackageScanClassResolver.class);
List<Class<?>> excluded = CastUtils.cast(Arrays.asList(excludeRoutes()));
excludingResolver.setExcludedClasses(new HashSet<Class<?>>(excluded));
Modified: camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java (original)
+++ camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java Mon Dec 12 08:57:03 2011
@@ -139,7 +139,7 @@ public abstract class CamelSpringTestSup
routeExcludingContext.registerBeanDefinition("excludingResolver", new RootBeanDefinition(ExcludingPackageScanClassResolver.class));
routeExcludingContext.refresh();
- ExcludingPackageScanClassResolver excludingResolver = (ExcludingPackageScanClassResolver)routeExcludingContext.getBean("excludingResolver");
+ ExcludingPackageScanClassResolver excludingResolver = routeExcludingContext.getBean("excludingResolver", ExcludingPackageScanClassResolver.class);
List<Class<?>> excluded = CastUtils.cast(Arrays.asList(excludeRoutes()));
excludingResolver.setExcludedClasses(new HashSet<Class<?>>(excluded));
@@ -169,14 +169,7 @@ public abstract class CamelSpringTestSup
* it is not present or the correct type
*/
public <T> T getMandatoryBean(Class<T> type, String name) {
- Object value = applicationContext.getBean(name);
- assertNotNull(value, "No spring bean found for name <" + name + ">");
- if (type.isInstance(value)) {
- return type.cast(value);
- } else {
- fail("Spring bean <" + name + "> is not an instanceof " + type.getName() + " but is of type " + ObjectHelper.className(value));
- return null;
- }
+ return applicationContext.getBean(name, type);
}
@Override
Modified: camel/trunk/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java (original)
+++ camel/trunk/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java Mon Dec 12 08:57:03 2011
@@ -147,7 +147,7 @@ public class VelocityEndpoint extends Re
public VelocityEndpoint findOrCreateEndpoint(String uri, String newResourceUri) {
String newUri = uri.replace(getResourceUri(), newResourceUri);
log.debug("Getting endpoint with URI: {}", newUri);
- return (VelocityEndpoint) getCamelContext().getEndpoint(newUri);
+ return getCamelContext().getEndpoint(newUri, VelocityEndpoint.class);
}
@SuppressWarnings("unchecked")
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/spring/CamelRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/spring/CamelRouteTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/spring/CamelRouteTest.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/spring/CamelRouteTest.java Mon Dec 12 08:57:03 2011
@@ -60,7 +60,7 @@ public class CamelRouteTest extends Asse
public void setUp() throws Exception {
applicationContext = new FileSystemXmlApplicationContext("src/main/webapp/WEB-INF/applicationContext.xml");
applicationContext.start();
- Map<String, CamelContext> beansOfType = CastUtils.cast(applicationContext.getBeansOfType(CamelContext.class));
+ Map<String, CamelContext> beansOfType = applicationContext.getBeansOfType(CamelContext.class);
camelContext = beansOfType.isEmpty() ? null : beansOfType.values().iterator().next();
assertNotNull("camelContext", camelContext);
}
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/util/JMXRouteStatisticsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/util/JMXRouteStatisticsTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/util/JMXRouteStatisticsTest.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/util/JMXRouteStatisticsTest.java Mon Dec 12 08:57:03 2011
@@ -61,7 +61,7 @@ public class JMXRouteStatisticsTest exte
public void setUp() throws Exception {
applicationContext = new FileSystemXmlApplicationContext("src/main/webapp/WEB-INF/applicationContext.xml");
applicationContext.start();
- Map<String, CamelContext> beansOfType = CastUtils.cast(applicationContext.getBeansOfType(CamelContext.class));
+ Map<String, CamelContext> beansOfType = applicationContext.getBeansOfType(CamelContext.class);
camelContext = beansOfType.isEmpty() ? null : beansOfType.values().iterator().next();
assertNotNull("camelContext", camelContext);
}
Modified: camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppMultiUserChatTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppMultiUserChatTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppMultiUserChatTest.java (original)
+++ camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppMultiUserChatTest.java Mon Dec 12 08:57:03 2011
@@ -36,7 +36,7 @@ public class XmppMultiUserChatTest exten
@Test
public void testXmppChat() throws Exception {
// TODO: requires online against jabber. Test this manually
- consumerEndpoint = (MockEndpoint)context.getEndpoint("mock:out");
+ consumerEndpoint = context.getEndpoint("mock:out", MockEndpoint.class);
consumerEndpoint.expectedBodiesReceived(body1, body2);
//will send chat messages to the room
Modified: camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteChatTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteChatTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteChatTest.java (original)
+++ camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteChatTest.java Mon Dec 12 08:57:03 2011
@@ -36,8 +36,8 @@ public class XmppRouteChatTest extends C
@Test
public void testXmppChat() throws Exception {
// TODO: requires online against jabber. Test this manually
- consumerEndpoint = (MockEndpoint)context.getEndpoint("mock:out1");
- producerEndpoint = (MockEndpoint)context.getEndpoint("mock:out2");
+ consumerEndpoint = context.getEndpoint("mock:out1", MockEndpoint.class);
+ producerEndpoint = context.getEndpoint("mock:out2", MockEndpoint.class);
consumerEndpoint.expectedBodiesReceived(body1, body2);
producerEndpoint.expectedBodiesReceived(body1, body2);
Modified: camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteMultipleProducersSingleConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteMultipleProducersSingleConsumerTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteMultipleProducersSingleConsumerTest.java (original)
+++ camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteMultipleProducersSingleConsumerTest.java Mon Dec 12 08:57:03 2011
@@ -33,8 +33,8 @@ public class XmppRouteMultipleProducersS
@Test
public void testProducerGetsEverything() throws Exception {
- goodEndpoint = (MockEndpoint)context.getEndpoint("mock:good");
- badEndpoint = (MockEndpoint)context.getEndpoint("mock:bad");
+ goodEndpoint = context.getEndpoint("mock:good", MockEndpoint.class);
+ badEndpoint = context.getEndpoint("mock:bad", MockEndpoint.class);
goodEndpoint.expectedMessageCount(4);
badEndpoint.expectedMessageCount(0);
Modified: camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/policy/ZooKeeperRoutePolicy.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/policy/ZooKeeperRoutePolicy.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/policy/ZooKeeperRoutePolicy.java (original)
+++ camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/policy/ZooKeeperRoutePolicy.java Mon Dec 12 08:57:03 2011
@@ -208,7 +208,7 @@ public class ZooKeeperRoutePolicy extend
if (log.isInfoEnabled()) {
log.info(format("Initializing ZookeeperRoutePolicy with uri '%s'", uri));
}
- ZooKeeperEndpoint zep = (ZooKeeperEndpoint)camelContext.getEndpoint(uri);
+ ZooKeeperEndpoint zep = camelContext.getEndpoint(uri, ZooKeeperEndpoint.class);
zep.getConfiguration().setCreate(true);
String fullpath = createFullPathToCandidate(zep);
Exchange e = zep.createExchange();
Modified: camel/trunk/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/CafeRouteBuilderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/CafeRouteBuilderTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/CafeRouteBuilderTest.java (original)
+++ camel/trunk/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/CafeRouteBuilderTest.java Mon Dec 12 08:57:03 2011
@@ -50,8 +50,8 @@ public class CafeRouteBuilderTest extend
@Test
public void testSplitter() throws InterruptedException {
- MockEndpoint coldDrinks = (MockEndpoint)context.getEndpoint("mock:coldDrinks");
- MockEndpoint hotDrinks = (MockEndpoint)context.getEndpoint("mock:hotDrinks");
+ MockEndpoint coldDrinks = context.getEndpoint("mock:coldDrinks", MockEndpoint.class);
+ MockEndpoint hotDrinks = context.getEndpoint("mock:hotDrinks", MockEndpoint.class);
Order order = new Order(1);
order.addItem(DrinkType.ESPRESSO, 2, true);
Modified: camel/trunk/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/CafeRouteSpringIntegrationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/CafeRouteSpringIntegrationTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/CafeRouteSpringIntegrationTest.java (original)
+++ camel/trunk/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/CafeRouteSpringIntegrationTest.java Mon Dec 12 08:57:03 2011
@@ -58,7 +58,7 @@ public class CafeRouteSpringIntegrationT
}
protected CamelContext getCamelContext() throws Exception {
- return (DefaultCamelContext) applicationContext.getBean("camel");
+ return applicationContext.getBean("camel", CamelContext.class);
}
}
Modified: camel/trunk/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/CafeRouteSpringTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/CafeRouteSpringTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/CafeRouteSpringTest.java (original)
+++ camel/trunk/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/CafeRouteSpringTest.java Mon Dec 12 08:57:03 2011
@@ -33,8 +33,8 @@ public class CafeRouteSpringTest extends
applicationContext = new ClassPathXmlApplicationContext("META-INF/camel-routes.xml");
setUseRouteBuilder(false);
super.setUp();
- waiter = (TestWaiter) applicationContext.getBean("waiter");
- driverRouter = (TestDrinkRouter) applicationContext.getBean("drinkRouter");
+ waiter = applicationContext.getBean("waiter", TestWaiter.class);
+ driverRouter = applicationContext.getBean("drinkRouter", TestDrinkRouter.class);
}
@After
@@ -46,7 +46,7 @@ public class CafeRouteSpringTest extends
}
protected CamelContext createCamelContext() throws Exception {
- return (CamelContext) applicationContext.getBean("camel");
+ return applicationContext.getBean("camel", CamelContext.class);
}
}
Modified: camel/trunk/examples/camel-example-jms-file/src/test/java/org/apache/camel/example/jmstofile/JmsToFileRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-jms-file/src/test/java/org/apache/camel/example/jmstofile/JmsToFileRouteTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-jms-file/src/test/java/org/apache/camel/example/jmstofile/JmsToFileRouteTest.java (original)
+++ camel/trunk/examples/camel-example-jms-file/src/test/java/org/apache/camel/example/jmstofile/JmsToFileRouteTest.java Mon Dec 12 08:57:03 2011
@@ -28,7 +28,7 @@ public class JmsToFileRouteTest extends
public void startRoute() throws Exception {
AbstractApplicationContext applicationContext =
new ClassPathXmlApplicationContext(new String[]{"/META-INF/spring/camelContext.xml"});
- CamelContext camelContext = (CamelContext)applicationContext.getBean("camelContext");
+ CamelContext camelContext = applicationContext.getBean("camelContext", CamelContext.class);
assertNotNull("The camel context should not be null", camelContext);
Thread.sleep(2000);
camelContext.stop();
Modified: camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/version/LoanBrokerQueueTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/version/LoanBrokerQueueTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/version/LoanBrokerQueueTest.java (original)
+++ camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/version/LoanBrokerQueueTest.java Mon Dec 12 08:57:03 2011
@@ -79,7 +79,7 @@ public class LoanBrokerQueueTest extends
@Test
public void testClientInvocation() throws Exception {
- MockEndpoint endpoint = (MockEndpoint) camelContext.getEndpoint("mock:endpoint");
+ MockEndpoint endpoint = camelContext.getEndpoint("mock:endpoint", MockEndpoint.class);
endpoint.expectedMessageCount(2);
// send out the request message
for (int i = 0; i < 2; i++) {
Modified: camel/trunk/examples/camel-example-route-throttling/src/main/java/org/apache/camel/example/client/CamelClient.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-route-throttling/src/main/java/org/apache/camel/example/client/CamelClient.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-route-throttling/src/main/java/org/apache/camel/example/client/CamelClient.java (original)
+++ camel/trunk/examples/camel-example-route-throttling/src/main/java/org/apache/camel/example/client/CamelClient.java Mon Dec 12 08:57:03 2011
@@ -45,7 +45,7 @@ public final class CamelClient {
ApplicationContext context = new ClassPathXmlApplicationContext("camel-client.xml");
// get the camel template for Spring template style sending of messages (= producer)
- final ProducerTemplate producer = (ProducerTemplate) context.getBean("camelTemplate");
+ final ProducerTemplate producer = context.getBean("camelTemplate", ProducerTemplate.class);
// now send a lot of messages
System.out.println("Sending ...");
Modified: camel/trunk/examples/camel-example-route-throttling/src/main/java/org/apache/camel/example/client/CamelFileClient.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-route-throttling/src/main/java/org/apache/camel/example/client/CamelFileClient.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-route-throttling/src/main/java/org/apache/camel/example/client/CamelFileClient.java (original)
+++ camel/trunk/examples/camel-example-route-throttling/src/main/java/org/apache/camel/example/client/CamelFileClient.java Mon Dec 12 08:57:03 2011
@@ -36,7 +36,7 @@ public final class CamelFileClient {
ApplicationContext context = new ClassPathXmlApplicationContext("camel-file-client.xml");
// get the camel template for Spring template style sending of messages (= producer)
- final ProducerTemplate producer = (ProducerTemplate) context.getBean("camelTemplate");
+ final ProducerTemplate producer = context.getBean("camelTemplate", ProducerTemplate.class);
// now send a lot of messages
System.out.println("Writing files ...");
Modified: camel/trunk/examples/camel-example-spring-javaconfig/src/test/java/org/apache/camel/example/spring/javaconfig/IntegrationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-spring-javaconfig/src/test/java/org/apache/camel/example/spring/javaconfig/IntegrationTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-spring-javaconfig/src/test/java/org/apache/camel/example/spring/javaconfig/IntegrationTest.java (original)
+++ camel/trunk/examples/camel-example-spring-javaconfig/src/test/java/org/apache/camel/example/spring/javaconfig/IntegrationTest.java Mon Dec 12 08:57:03 2011
@@ -40,7 +40,7 @@ public class IntegrationTest extends Ass
ApplicationContext context = new ClassPathXmlApplicationContext("/META-INF/spring/camel-context.xml");
String[] names = context.getBeanNamesForType(CamelContext.class);
assertEquals("There should be a camel context ", 1, names.length);
- CamelContext camelContext = (CamelContext) context.getBean(names[0]);
+ CamelContext camelContext = context.getBean(names[0], CamelContext.class);
assertNotNull(camelContext);
Thread.sleep(2000);
}
Modified: camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClient.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClient.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClient.java (original)
+++ camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClient.java Mon Dec 12 08:57:03 2011
@@ -38,7 +38,7 @@ public final class CamelClient {
ApplicationContext context = new ClassPathXmlApplicationContext("camel-client.xml");
// get the camel template for Spring template style sending of messages (= producer)
- ProducerTemplate camelTemplate = (ProducerTemplate) context.getBean("camelTemplate");
+ ProducerTemplate camelTemplate = context.getBean("camelTemplate", ProducerTemplate.class);
System.out.println("Invoking the multiply with 22");
// as opposed to the CamelClientRemoting example we need to define the service URI in this java code
Modified: camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientEndpoint.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientEndpoint.java (original)
+++ camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientEndpoint.java Mon Dec 12 08:57:03 2011
@@ -43,7 +43,7 @@ public final class CamelClientEndpoint {
System.out.println("Notice this client requires that the CamelServer is already running!");
ApplicationContext context = new ClassPathXmlApplicationContext("camel-client.xml");
- CamelContext camel = (CamelContext) context.getBean("camel-client");
+ CamelContext camel = context.getBean("camel-client", CamelContext.class);
// get the endpoint from the camel context
Endpoint endpoint = camel.getEndpoint("jms:queue:numbers");
Modified: camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientRemoting.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientRemoting.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientRemoting.java (original)
+++ camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientRemoting.java Mon Dec 12 08:57:03 2011
@@ -38,7 +38,7 @@ public final class CamelClientRemoting {
// just get the proxy to the service and we as the client can use the "proxy" as it was
// a local object we are invoking. Camel will under the covers do the remote communication
// to the remote ActiveMQ server and fetch the response.
- Multiplier multiplier = (Multiplier)context.getBean("multiplierProxy");
+ Multiplier multiplier = context.getBean("multiplierProxy", Multiplier.class);
System.out.println("Invoking the multiply with 33");
int response = multiplier.multiply(33);
Modified: camel/trunk/examples/camel-example-spring-jms/src/test/java/org/apache/camel/example/SpringJmsClientServerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-spring-jms/src/test/java/org/apache/camel/example/SpringJmsClientServerTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-spring-jms/src/test/java/org/apache/camel/example/SpringJmsClientServerTest.java (original)
+++ camel/trunk/examples/camel-example-spring-jms/src/test/java/org/apache/camel/example/SpringJmsClientServerTest.java Mon Dec 12 08:57:03 2011
@@ -55,7 +55,7 @@ public class SpringJmsClientServerTest e
ConfigurableApplicationContext context = new ClassPathXmlApplicationContext("camel-client.xml");
// get the camel template for Spring template style sending of messages (= producer)
- ProducerTemplate camelTemplate = (ProducerTemplate) context.getBean("camelTemplate");
+ ProducerTemplate camelTemplate = context.getBean("camelTemplate", ProducerTemplate.class);
// as opposed to the CamelClientRemoting example we need to define the service URI in this java code
int response = (Integer)camelTemplate.sendBody("jms:queue:numbers", ExchangePattern.InOut, 22);
@@ -68,7 +68,7 @@ public class SpringJmsClientServerTest e
@Test
public void testCamelEndpointInvocation() throws Exception {
ConfigurableApplicationContext context = new ClassPathXmlApplicationContext("camel-client.xml");
- CamelContext camel = (CamelContext) context.getBean("camel-client");
+ CamelContext camel = context.getBean("camel-client", CamelContext.class);
// get the endpoint from the camel context
Endpoint endpoint = camel.getEndpoint("jms:queue:numbers");
@@ -105,7 +105,7 @@ public class SpringJmsClientServerTest e
// just get the proxy to the service and we as the client can use the "proxy" as it was
// a local object we are invoking. Camel will under the covers do the remote communication
// to the remote ActiveMQ server and fetch the response.
- Multiplier multiplier = (Multiplier)context.getBean("multiplierProxy");
+ Multiplier multiplier = context.getBean("multiplierProxy", Multiplier.class);
int response = multiplier.multiply(33);
Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationSpringTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationSpringTestSupport.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationSpringTestSupport.java (original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationSpringTestSupport.java Mon Dec 12 08:57:03 2011
@@ -33,7 +33,7 @@ public abstract class OSGiIntegrationSpr
applicationContext.refresh();
String[] names = applicationContext.getBeanNamesForType(SpringCamelContext.class);
if (names.length == 1) {
- return (SpringCamelContext)applicationContext.getBean(names[0], SpringCamelContext.class);
+ return applicationContext.getBean(names[0], SpringCamelContext.class);
} else {
throw new IllegalStateException("Exactly 1 bean of type SpringCamelContext expected but found " + names.length + " beans.");
}
Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/CacheManagerFactoryRefTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/CacheManagerFactoryRefTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/CacheManagerFactoryRefTest.java (original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/CacheManagerFactoryRefTest.java Mon Dec 12 08:57:03 2011
@@ -49,7 +49,7 @@ public class CacheManagerFactoryRefTest
@Test
public void testCache() throws Exception {
- CacheEndpoint endpoint = (CacheEndpoint) context.getEndpoint(CACHE_URI);
+ CacheEndpoint endpoint = context.getEndpoint(CACHE_URI, CacheEndpoint.class);
// do some routes to let everything be initialized
template.sendBody("direct:add", "Hello World");
Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/xslt/XsltBlueprintRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/xslt/XsltBlueprintRouteTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/xslt/XsltBlueprintRouteTest.java (original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/xslt/XsltBlueprintRouteTest.java Mon Dec 12 08:57:03 2011
@@ -43,7 +43,7 @@ public class XsltBlueprintRouteTest exte
@Test
public void testSendMessageAndHaveItTransformed() throws Exception {
- MockEndpoint endpoint = (MockEndpoint)camelContext.getEndpoint("mock:result");
+ MockEndpoint endpoint = camelContext.getEndpoint("mock:result", MockEndpoint.class);
endpoint.expectedMessageCount(1);
mytemplate.sendBody("direct:start",
Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hdfs/HdfsBlueprintRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hdfs/HdfsBlueprintRouteTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hdfs/HdfsBlueprintRouteTest.java (original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hdfs/HdfsBlueprintRouteTest.java Mon Dec 12 08:57:03 2011
@@ -56,7 +56,7 @@ public class HdfsBlueprintRouteTest exte
ProducerTemplate template = ctx.createProducerTemplate();
template.sendBody("direct:start", "CIAO");
- MockEndpoint resultEndpoint = (MockEndpoint) ctx.getEndpoint("mock:result");
+ MockEndpoint resultEndpoint = ctx.getEndpoint("mock:result", MockEndpoint.class);
resultEndpoint.expectedMessageCount(1);
resultEndpoint.assertIsSatisfied();
}
Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hdfs/HdfsRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hdfs/HdfsRouteTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hdfs/HdfsRouteTest.java (original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hdfs/HdfsRouteTest.java Mon Dec 12 08:57:03 2011
@@ -75,7 +75,7 @@ public class HdfsRouteTest extends OSGiI
});
context.start();
- MockEndpoint resultEndpoint = (MockEndpoint) context.getEndpoint("mock:result");
+ MockEndpoint resultEndpoint = context.getEndpoint("mock:result", MockEndpoint.class);
resultEndpoint.expectedMessageCount(1);
resultEndpoint.assertIsSatisfied();
}
Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jclouds/BlobStoreBlueprintRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jclouds/BlobStoreBlueprintRouteTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jclouds/BlobStoreBlueprintRouteTest.java (original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jclouds/BlobStoreBlueprintRouteTest.java Mon Dec 12 08:57:03 2011
@@ -75,7 +75,7 @@ public class BlobStoreBlueprintRouteTest
BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, "(osgi.blueprint.container.symbolicname=CamelBlueprintJcloudsTestBundle)", 20000);
CamelContext ctx = getOsgiService(CamelContext.class, "(camel.context.symbolicname=CamelBlueprintJcloudsTestBundle)", 20000);
- MockEndpoint mock = (MockEndpoint) ctx.getEndpoint("mock:results");
+ MockEndpoint mock = ctx.getEndpoint("mock:results", MockEndpoint.class);
ProducerTemplate template = ctx.createProducerTemplate();
mock.expectedMessageCount(2);
template.sendBodyAndHeader("direct:start", new SimpleObject("1", "Test 1"), JcloudsConstants.BLOB_NAME, "blob1");
Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaBlueprintRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaBlueprintRouteTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaBlueprintRouteTest.java (original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaBlueprintRouteTest.java Mon Dec 12 08:57:03 2011
@@ -48,7 +48,7 @@ public class JpaBlueprintRouteTest exten
BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, "(osgi.blueprint.container.symbolicname=CamelBlueprintJpaTestBundle)", 30000);
CamelContext ctx = getOsgiService(CamelContext.class, "(camel.context.symbolicname=CamelBlueprintJpaTestBundle)", 20000);
- MockEndpoint mock = (MockEndpoint) ctx.getEndpoint("mock:result");
+ MockEndpoint mock = ctx.getEndpoint("mock:result", MockEndpoint.class);
mock.expectedMessageCount(1);
ProducerTemplate template = ctx.createProducerTemplate();
Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaRouteTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaRouteTest.java (original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaRouteTest.java Mon Dec 12 08:57:03 2011
@@ -104,7 +104,7 @@ public class JpaRouteTest extends OSGiIn
private void assertEntityInDB() throws Exception {
// must type cast with Spring 2.x
- jpaTemplate = (JpaTemplate) applicationContext.getBean("jpaTemplate");
+ jpaTemplate = applicationContext.getBean("jpaTemplate", JpaTemplate.class);
List list = jpaTemplate.find(SELECT_ALL_STRING);
assertEquals(1, list.size());
@@ -114,7 +114,7 @@ public class JpaRouteTest extends OSGiIn
protected void cleanupRepository() {
// must type cast with Spring 2.x
- jpaTemplate = (JpaTemplate) applicationContext.getBean("jpaTemplate");
+ jpaTemplate = applicationContext.getBean("jpaTemplate", JpaTemplate.class);
TransactionTemplate transactionTemplate = new TransactionTemplate();
transactionTemplate.setTransactionManager(new JpaTransactionManager(jpaTemplate.getEntityManagerFactory()));
Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/krati/KratiBlueprintRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/krati/KratiBlueprintRouteTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/krati/KratiBlueprintRouteTest.java (original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/krati/KratiBlueprintRouteTest.java Mon Dec 12 08:57:03 2011
@@ -57,7 +57,7 @@ public class KratiBlueprintRouteTest ext
getInstalledBundle("CamelBlueprintKratiTestBundle").start();
BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, "(osgi.blueprint.container.symbolicname=CamelBlueprintKratiTestBundle)", 20000);
CamelContext ctx = getOsgiService(CamelContext.class, "(camel.context.symbolicname=CamelBlueprintKratiTestBundle)", 20000);
- MockEndpoint mock = (MockEndpoint) ctx.getEndpoint("mock:results");
+ MockEndpoint mock = ctx.getEndpoint("mock:results", MockEndpoint.class);
ProducerTemplate template = ctx.createProducerTemplate();
mock.expectedMessageCount(2);
template.sendBodyAndHeader("direct:put", new SomeObject("1", "Test 1"), KratiConstants.KEY, "1");
Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/sql/SqlBlueprintRoute.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/sql/SqlBlueprintRoute.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/sql/SqlBlueprintRoute.java (original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/sql/SqlBlueprintRoute.java Mon Dec 12 08:57:03 2011
@@ -59,7 +59,7 @@ public class SqlBlueprintRoute extends O
BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, "(osgi.blueprint.container.symbolicname=CamelBlueprintSqlTestBundle)", 10000);
CamelContext ctx = getOsgiService(CamelContext.class, "(camel.context.symbolicname=CamelBlueprintSqlTestBundle)", 10000);
- MockEndpoint mock = (MockEndpoint) ctx.getEndpoint("mock:result");
+ MockEndpoint mock = ctx.getEndpoint("mock:result", MockEndpoint.class);
mock.expectedMessageCount(1);
List<Object> body = new ArrayList<Object>();
body.add("ASF");
@@ -84,7 +84,7 @@ public class SqlBlueprintRoute extends O
BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, "(osgi.blueprint.container.symbolicname=CamelBlueprintSqlTestBundle)", 10000);
CamelContext ctx = getOsgiService(CamelContext.class, "(camel.context.symbolicname=CamelBlueprintSqlTestBundle)", 10000);
- MockEndpoint mock = (MockEndpoint) ctx.getEndpoint("mock:result");
+ MockEndpoint mock = ctx.getEndpoint("mock:result", MockEndpoint.class);
try {
ProducerTemplate template = ctx.createProducerTemplate();
template.sendBody("direct:list", "ASF");
@@ -104,7 +104,7 @@ public class SqlBlueprintRoute extends O
DataSource ds = getOsgiService(DataSource.class, 10000);
JdbcTemplate jdbcTemplate = new JdbcTemplate(ds);
ProducerTemplate template = ctx.createProducerTemplate();
- MockEndpoint mock = (MockEndpoint) ctx.getEndpoint("mock:result");
+ MockEndpoint mock = ctx.getEndpoint("mock:result", MockEndpoint.class);
mock.expectedMessageCount(1);
template.sendBody("direct:insert", new Object[]{10, "test", "test"});
Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/sql/SqlRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/sql/SqlRouteTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/sql/SqlRouteTest.java (original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/sql/SqlRouteTest.java Mon Dec 12 08:57:03 2011
@@ -73,7 +73,7 @@ public class SqlRouteTest extends OSGiIn
applicationContext.setBundleContext(bundleContext);
applicationContext.refresh();
}
- ds = (DataSource) applicationContext.getBean("dataSource");
+ ds = applicationContext.getBean("dataSource", DataSource.class);
jdbcTemplate = new JdbcTemplate(ds);
return SpringCamelContext.springCamelContext(applicationContext);
}
Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xstream/XstreamBlueprintRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xstream/XstreamBlueprintRouteTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xstream/XstreamBlueprintRouteTest.java (original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xstream/XstreamBlueprintRouteTest.java Mon Dec 12 08:57:03 2011
@@ -47,7 +47,7 @@ public class XstreamBlueprintRouteTest e
BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, "(osgi.blueprint.container.symbolicname=CamelBlueprintXstreamTestBundle)", 10000);
CamelContext ctx = getOsgiService(CamelContext.class, "(camel.context.symbolicname=CamelBlueprintXstreamTestBundle)", 10000);
- MockEndpoint mock = (MockEndpoint) ctx.getEndpoint("mock:result");
+ MockEndpoint mock = ctx.getEndpoint("mock:result", MockEndpoint.class);
mock.expectedMessageCount(1);
String body = "<org.apache.camel.itest.osgi.xstream.SampleObject>\n"
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServicesTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServicesTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServicesTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServicesTest.java Mon Dec 12 08:57:03 2011
@@ -47,7 +47,7 @@ public class CustomerServicesTest extend
clientContext = new ClassPathXmlApplicationContext(
new String[] {"spring-config/client-applicationContext.xml"});
- CustomerServiceV1 customerService = (CustomerServiceV1) clientContext.getBean("org.apache.camel.itest.customerrelations.CustomerServiceV1");
+ CustomerServiceV1 customerService = clientContext.getBean("org.apache.camel.itest.customerrelations.CustomerServiceV1", CustomerServiceV1.class);
// CXF 2.1.2 only apply the SOAPAction for the request message (in SoapPreProtocolOutInterceptor)
// After went through the SOAP 1.1 specification, I got that the SOAPAction is only for the request message
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServicesWsAddressingTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServicesWsAddressingTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServicesWsAddressingTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServicesWsAddressingTest.java Mon Dec 12 08:57:03 2011
@@ -34,7 +34,7 @@ public class CustomerServicesWsAddressin
clientContext = new ClassPathXmlApplicationContext(
new String[] {"spring-config/client-WsAddressingContext.xml"});
- CustomerServiceV1 customerService = (CustomerServiceV1) clientContext.getBean("org.apache.camel.itest.customerrelations.CustomerServiceV1");
+ CustomerServiceV1 customerService = clientContext.getBean("org.apache.camel.itest.customerrelations.CustomerServiceV1", CustomerServiceV1.class);
Customer customer = customerService.getCustomer("12345");
assertNotNull("We should get Customer here", customer);
Modified: camel/trunk/tooling/maven/maven-html-to-pdf/src/main/java/org/apache/camel/maven/HtmlToPdfMojo.java
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/maven-html-to-pdf/src/main/java/org/apache/camel/maven/HtmlToPdfMojo.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/tooling/maven/maven-html-to-pdf/src/main/java/org/apache/camel/maven/HtmlToPdfMojo.java (original)
+++ camel/trunk/tooling/maven/maven-html-to-pdf/src/main/java/org/apache/camel/maven/HtmlToPdfMojo.java Mon Dec 12 08:57:03 2011
@@ -243,7 +243,8 @@ public class HtmlToPdfMojo extends Abstr
private void storeDummyFile() throws FileNotFoundException {
PrintWriter out = new PrintWriter(new BufferedOutputStream(new FileOutputStream(getHTMLFileName())));
out.println("<html>");
- out.println("<body>Generation of the offline PDF version of the manual failed, however you could try <a href=\"http://camel.apache.org/book-in-one-page.html\">the online HTML version</a>.</body>");
+ out.println("<body>Generation of the offline PDF version of the manual failed, however you could try "
+ + "<a href=\"http://camel.apache.org/book-in-one-page.html\">the online HTML version</a>.</body>");
out.println("</html>");
out.close();
getLog().info("Stored dummy file: " + getHTMLFileName() + " since download of " + page + " failed.");