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 [1/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/...
Author: davsclaus
Date: Mon Dec 12 08:57:03 2011
New Revision: 1213169
URL: http://svn.apache.org/viewvc?rev=1213169&view=rev
Log:
CAMEL-4765: Perfer to use API which takes type paramter over explict type casting. We can do this now Spring 3.0+ is min. Thanks to Babak for the patch.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/xslt/XsltEndpoint.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/pojomessage/PojoProxyHelperOneWayTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/xslt/XsltReferenceParameterTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/GzipDataFormatTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ZipDataFormatTest.java
camel/trunk/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
camel/trunk/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorConfigurationTest.java
camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerTest.java
camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslCometdProducerConsumerTest.java
camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslContextParametersCometdProducerConsumerTest.java
camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslContextParametersInUriCometdProducerConsumerTest.java
camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/AbstractCxfBeanDefinitionParser.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomerStartStopTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CamelEndpointSpringConfigureTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanBusSettingTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanWithBusTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeansRouterTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/SpringBusFactoryBeanTest.java
camel/trunk/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerEndpoint.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/UriConfigurationTest.java
camel/trunk/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsConsumerTest.java
camel/trunk/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerConsumerTest.java
camel/trunk/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/integration/HdfsProducerConsumerIntegrationTest.java
camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpReferenceParameterTest.java
camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpReferenceParameterTest.java
camel/trunk/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcMultiChannelRouteTest.java
camel/trunk/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcOnReplyTest.java
camel/trunk/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcPrivmsgTest.java
camel/trunk/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcRouteTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBridgeMultipartRouteTest.java
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDestinationResolverTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsQosRouteTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/remoting/JmsRemotingTest.java
camel/trunk/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/JMXComponentTest.java
camel/trunk/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/JMXEndpointTest.java
camel/trunk/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/SimpleBeanFixture.java
camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/interceptor/JpaTraceEventMessageTest.java
camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaBatchConsumerTest.java
camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaFlushOnSendTest.java
camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaNonTXRollbackTest.java
camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaTXRollbackTest.java
camel/trunk/components/camel-krati/src/test/java/org/apache/camel/component/krati/KratiConsumerSpringTest.java
camel/trunk/components/camel-krati/src/test/java/org/apache/camel/component/krati/KratiConsumerTest.java
camel/trunk/components/camel-krati/src/test/java/org/apache/camel/component/krati/KratiProducerSpringTest.java
camel/trunk/components/camel-krati/src/test/java/org/apache/camel/component/krati/KratiProducerTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/AdditionalMailPropertiesTest.java
camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaNoDefaultCodecTest.java
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/CronScheduledRoutePolicyTest.java
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/MultiplePoliciesOnRouteTest.java
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledCombinedRoutePolicyTest.java
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicyTest.java
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringScheduledRoutePolicyTest.java
camel/trunk/components/camel-solr/src/test/java/org/apache/camel/component/solr/InitSolrEndpointTest.java
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java
camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationOneWayConsumerTest.java
camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationProducerTest.java
camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationTwoWayConsumerTest.java
camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapterTest.java
camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapterTest.java
camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/ConfigurationTest.java
camel/trunk/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/MainTest.java
camel/trunk/components/camel-spring-security/src/test/java/org/apache/camel/component/spring/security/config/SpringSecurityAuthorizationPolicyConfigTest.java
camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingByBeanNameRouteTest.java
camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingResponseHandlingRouteTest.java
camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingRouteTest.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelBeanPostProcessor.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/Main.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/SpringRouteBuilder.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/util/CamelContextResolverHelper.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/ApplicationContextTestSupport.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/CustomProcessorWithNamespacesTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultStreamCachingTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/EndpointReferenceTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/RoutingUsingCamelContextFactoryTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/SpringTestSupport.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/AnotherCamelProxyTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelContextAutoStartupTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelContextFactoryBeanTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelProxyTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelProxyUsingRefTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteAutoStartupPropertiesTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteBuilderRefTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteRefMultipleCamelContextRefsTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextCustomDefaultThreadPoolProfileTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/scan/SpringComponentScanTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/scan/SpringComponentScanWithDeprecatedPackagesTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/PojoDualCamelContextConsumerTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParserTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/ContainerWideInterceptorTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringTwoCamelContextDirectEndpointTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/postprocessor/PlainSpringCustomPostProcessorOnRouteBuilderTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/tracing/TraceInterceptorSubclassTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/tracing/TracingTestBase.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/produce/MyCoolBeanTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/EchoSpringRemotingPojoDirectTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingBeanConverterTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingRouteTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/xml/SpringXmlRouteBuilderTest.java
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelSpringTestSupport.java
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelSpringTestSupport.java
camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java
camel/trunk/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/spring/CamelRouteTest.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/util/JMXRouteStatisticsTest.java
camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppMultiUserChatTest.java
camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteChatTest.java
camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteMultipleProducersSingleConsumerTest.java
camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/policy/ZooKeeperRoutePolicy.java
camel/trunk/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/CafeRouteBuilderTest.java
camel/trunk/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/CafeRouteSpringIntegrationTest.java
camel/trunk/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/CafeRouteSpringTest.java
camel/trunk/examples/camel-example-jms-file/src/test/java/org/apache/camel/example/jmstofile/JmsToFileRouteTest.java
camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/version/LoanBrokerQueueTest.java
camel/trunk/examples/camel-example-route-throttling/src/main/java/org/apache/camel/example/client/CamelClient.java
camel/trunk/examples/camel-example-route-throttling/src/main/java/org/apache/camel/example/client/CamelFileClient.java
camel/trunk/examples/camel-example-spring-javaconfig/src/test/java/org/apache/camel/example/spring/javaconfig/IntegrationTest.java
camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClient.java
camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientEndpoint.java
camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientRemoting.java
camel/trunk/examples/camel-example-spring-jms/src/test/java/org/apache/camel/example/SpringJmsClientServerTest.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationSpringTestSupport.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/CacheManagerFactoryRefTest.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/xslt/XsltBlueprintRouteTest.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hdfs/HdfsBlueprintRouteTest.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hdfs/HdfsRouteTest.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jclouds/BlobStoreBlueprintRouteTest.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaBlueprintRouteTest.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaRouteTest.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/krati/KratiBlueprintRouteTest.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/sql/SqlBlueprintRoute.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/sql/SqlRouteTest.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xstream/XstreamBlueprintRouteTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServicesTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServicesWsAddressingTest.java
camel/trunk/tooling/maven/maven-html-to-pdf/src/main/java/org/apache/camel/maven/HtmlToPdfMojo.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/xslt/XsltEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/xslt/XsltEndpoint.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/xslt/XsltEndpoint.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/xslt/XsltEndpoint.java Mon Dec 12 08:57:03 2011
@@ -73,7 +73,7 @@ public class XsltEndpoint extends Proces
public XsltEndpoint findOrCreateEndpoint(String uri, String newResourceUri) {
String newUri = uri.replace(resourceUri, newResourceUri);
LOG.trace("Getting endpoint with URI: {}", newUri);
- return (XsltEndpoint) getCamelContext().getEndpoint(newUri);
+ return getCamelContext().getEndpoint(newUri, XsltEndpoint.class);
}
@Override
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/pojomessage/PojoProxyHelperOneWayTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/pojomessage/PojoProxyHelperOneWayTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/pojomessage/PojoProxyHelperOneWayTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/pojomessage/PojoProxyHelperOneWayTest.java Mon Dec 12 08:57:03 2011
@@ -35,7 +35,7 @@ public class PojoProxyHelperOneWayTest e
@Test
public void testOneWay() throws Exception {
Endpoint personEndpoint = context.getEndpoint("direct:person");
- MockEndpoint result = (MockEndpoint)context.getEndpoint("mock:result");
+ MockEndpoint result = context.getEndpoint("mock:result", MockEndpoint.class);
Person person = new Person("Chris");
result.expectedBodiesReceived(person);
PersonHandler sender = PojoProxyHelper.createProxy(personEndpoint, PersonHandler.class);
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/xslt/XsltReferenceParameterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/xslt/XsltReferenceParameterTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/xslt/XsltReferenceParameterTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/xslt/XsltReferenceParameterTest.java Mon Dec 12 08:57:03 2011
@@ -55,8 +55,8 @@ public class XsltReferenceParameterTest
registry.bind("testConverter", testConverter);
registry.bind("testTransformerFactory", testTransformerFactory);
- ProcessorEndpoint pep1 = (ProcessorEndpoint)context.getEndpoint(TEST_URI_1);
- ProcessorEndpoint pep2 = (ProcessorEndpoint)context.getEndpoint(TEST_URI_2);
+ ProcessorEndpoint pep1 = context.getEndpoint(TEST_URI_1, ProcessorEndpoint.class);
+ ProcessorEndpoint pep2 = context.getEndpoint(TEST_URI_2, ProcessorEndpoint.class);
builder1 = (XsltBuilder)pep1.getProcessor();
builder2 = (XsltBuilder)pep2.getProcessor();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextTest.java Mon Dec 12 08:57:03 2011
@@ -33,7 +33,6 @@ import org.apache.camel.builder.RouteBui
import org.apache.camel.component.bean.BeanComponent;
import org.apache.camel.component.direct.DirectComponent;
import org.apache.camel.component.log.LogComponent;
-import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.UuidGenerator;
import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.CamelContextHelper;
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/impl/GzipDataFormatTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/GzipDataFormatTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/impl/GzipDataFormatTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/impl/GzipDataFormatTest.java Mon Dec 12 08:57:03 2011
@@ -67,7 +67,7 @@ public class GzipDataFormatTest extends
});
context.start();
- MockEndpoint result = (MockEndpoint) context.getEndpoint("mock:result");
+ MockEndpoint result = context.getEndpoint("mock:result", MockEndpoint.class);
result.expectedBodiesReceived(TEXT.getBytes("UTF-8"));
sendText();
result.assertIsSatisfied();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ZipDataFormatTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ZipDataFormatTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ZipDataFormatTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ZipDataFormatTest.java Mon Dec 12 08:57:03 2011
@@ -104,7 +104,7 @@ public class ZipDataFormatTest extends C
});
context.start();
- MockEndpoint result = (MockEndpoint)context.getEndpoint("mock:result");
+ MockEndpoint result = context.getEndpoint("mock:result", MockEndpoint.class);
result.expectedBodiesReceived(TEXT);
sendText();
result.assertIsSatisfied();
Modified: camel/trunk/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java (original)
+++ camel/trunk/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java Mon Dec 12 08:57:03 2011
@@ -112,7 +112,7 @@ public class AMQPRouteTest extends Camel
@Before
public void setUp() throws Exception {
super.setUp();
- resultEndpoint = (MockEndpoint) context.getEndpoint("mock:result");
+ resultEndpoint = context.getEndpoint("mock:result", MockEndpoint.class);
}
protected CamelContext createCamelContext() throws Exception {
Modified: camel/trunk/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorConfigurationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorConfigurationTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorConfigurationTest.java (original)
+++ camel/trunk/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorConfigurationTest.java Mon Dec 12 08:57:03 2011
@@ -65,7 +65,7 @@ public class BeanValidatorConfigurationT
@Test
public void configureWithDefaults() throws Exception {
- ProcessorEndpoint endpoint = (ProcessorEndpoint) context.getEndpoint("bean-validator://x");
+ ProcessorEndpoint endpoint = context.getEndpoint("bean-validator://x", ProcessorEndpoint.class);
BeanValidator processor = (BeanValidator) endpoint.getProcessor();
assertNull(processor.getGroup());
@@ -77,11 +77,11 @@ public class BeanValidatorConfigurationT
@Test
public void configureBeanValidator() throws Exception {
- ProcessorEndpoint endpoint = (ProcessorEndpoint) context.getEndpoint("bean-validator://x"
+ ProcessorEndpoint endpoint = context.getEndpoint("bean-validator://x"
+ "?group=org.apache.camel.component.bean.validator.OptionalChecks"
+ "&messageInterpolator=#myMessageInterpolator"
+ "&traversableResolver=#myTraversableResolver"
- + "&constraintValidatorFactory=myConstraintValidatorFactory");
+ + "&constraintValidatorFactory=myConstraintValidatorFactory", ProcessorEndpoint.class);
BeanValidator processor = (BeanValidator) endpoint.getProcessor();
assertEquals("org.apache.camel.component.bean.validator.OptionalChecks", processor.getGroup().getName());
Modified: camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerTest.java (original)
+++ camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerTest.java Mon Dec 12 08:57:03 2011
@@ -42,7 +42,7 @@ public class CometdProducerConsumerTest
template.requestBodyAndHeader("direct:input", person, "testHeading", "value");
//assert
- MockEndpoint ep = (MockEndpoint) context.getEndpoint("mock:test");
+ MockEndpoint ep = context.getEndpoint("mock:test", MockEndpoint.class);
List<Exchange> exchanges = ep.getReceivedExchanges();
for (Exchange exchange : exchanges) {
Message message = exchange.getIn();
@@ -62,7 +62,7 @@ public class CometdProducerConsumerTest
template.requestBodyAndHeader("direct:input", "message", headerName, headerValue);
//assert
- MockEndpoint ep = (MockEndpoint) context.getEndpoint("mock:test");
+ MockEndpoint ep = context.getEndpoint("mock:test", MockEndpoint.class);
List<Exchange> exchanges = ep.getReceivedExchanges();
assertTrue(exchanges.size() > 0);
for (Exchange exchange : exchanges) {
Modified: camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslCometdProducerConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslCometdProducerConsumerTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslCometdProducerConsumerTest.java (original)
+++ camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslCometdProducerConsumerTest.java Mon Dec 12 08:57:03 2011
@@ -40,7 +40,7 @@ public class SslCometdProducerConsumerTe
public void testProducer() throws Exception {
Person person = new Person("David", "Greco");
template.requestBody("direct:input", person);
- MockEndpoint ep = (MockEndpoint) context.getEndpoint("mock:test");
+ MockEndpoint ep = context.getEndpoint("mock:test", MockEndpoint.class);
List<Exchange> exchanges = ep.getReceivedExchanges();
for (Exchange exchange : exchanges) {
Person person1 = (Person) exchange.getIn().getBody();
Modified: camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslContextParametersCometdProducerConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslContextParametersCometdProducerConsumerTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslContextParametersCometdProducerConsumerTest.java (original)
+++ camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslContextParametersCometdProducerConsumerTest.java Mon Dec 12 08:57:03 2011
@@ -42,7 +42,7 @@ public class SslContextParametersCometdP
public void testProducer() throws Exception {
Person person = new Person("David", "Greco");
template.requestBody("direct:input", person);
- MockEndpoint ep = (MockEndpoint) context.getEndpoint("mock:test");
+ MockEndpoint ep = context.getEndpoint("mock:test", MockEndpoint.class);
List<Exchange> exchanges = ep.getReceivedExchanges();
for (Exchange exchange : exchanges) {
Person person1 = (Person) exchange.getIn().getBody();
Modified: camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslContextParametersInUriCometdProducerConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslContextParametersInUriCometdProducerConsumerTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslContextParametersInUriCometdProducerConsumerTest.java (original)
+++ camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslContextParametersInUriCometdProducerConsumerTest.java Mon Dec 12 08:57:03 2011
@@ -65,7 +65,7 @@ public class SslContextParametersInUriCo
public void testProducer() throws Exception {
Person person = new Person("David", "Greco");
template.requestBody("direct:input", person);
- MockEndpoint ep = (MockEndpoint) context.getEndpoint("mock:test");
+ MockEndpoint ep = context.getEndpoint("mock:test", MockEndpoint.class);
List<Exchange> exchanges = ep.getReceivedExchanges();
for (Exchange exchange : exchanges) {
Person person1 = (Person) exchange.getIn().getBody();
Modified: camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java (original)
+++ camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java Mon Dec 12 08:57:03 2011
@@ -182,7 +182,7 @@ public class CamelDestinationTest extend
}
}
};
- MockEndpoint error = (MockEndpoint)context.getEndpoint("mock:error");
+ MockEndpoint error = context.getEndpoint("mock:error", MockEndpoint.class);
error.expectedMessageCount(0);
//this call will active the camelDestination
destination.setMessageObserver(observer);
@@ -233,7 +233,7 @@ public class CamelDestinationTest extend
}
};
- MockEndpoint error = (MockEndpoint)context.getEndpoint("mock:error");
+ MockEndpoint error = context.getEndpoint("mock:error", MockEndpoint.class);
error.expectedMessageCount(1);
//this call will active the camelDestination
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/AbstractCxfBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/AbstractCxfBeanDefinitionParser.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/AbstractCxfBeanDefinitionParser.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/AbstractCxfBeanDefinitionParser.java Mon Dec 12 08:57:03 2011
@@ -83,8 +83,7 @@ public abstract class AbstractCxfBeanDef
@SuppressWarnings("unchecked")
protected Map<String, Object> getPropertyMap(BeanDefinitionBuilder bean, boolean lazyInstantiation) {
- PropertyValue propertyValue = (PropertyValue)bean.getBeanDefinition().getPropertyValues()
- .getPropertyValue("properties");
+ PropertyValue propertyValue = bean.getBeanDefinition().getPropertyValues().getPropertyValue("properties");
Map<String, Object> map = null;
if (propertyValue == null) {
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomerStartStopTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomerStartStopTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomerStartStopTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomerStartStopTest.java Mon Dec 12 08:57:03 2011
@@ -66,7 +66,7 @@ public class CxfCustomerStartStopTest ex
ClassPathXmlApplicationContext applicationContext =
new ClassPathXmlApplicationContext("org/apache/camel/component/cxf/CamelCxfConsumerContext.xml");
- Bus bus = (Bus)applicationContext.getBean("cxf");
+ Bus bus = applicationContext.getBean("cxf", Bus.class);
// Bus shutdown will be called when the application context is closed.
String orig = System.setProperty("org.apache.cxf.transports.http_jetty.DontClosePort", "false");
applicationContext.close();
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CamelEndpointSpringConfigureTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CamelEndpointSpringConfigureTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CamelEndpointSpringConfigureTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CamelEndpointSpringConfigureTest.java Mon Dec 12 08:57:03 2011
@@ -33,7 +33,7 @@ public class CamelEndpointSpringConfigur
@Test
public void testCreateDestinationFromSpring() throws Exception {
- CxfEndpoint cxfEndpoint = (CxfEndpoint) context.getEndpoint("cxf:bean:serviceEndpoint");
+ CxfEndpoint cxfEndpoint = context.getEndpoint("cxf:bean:serviceEndpoint", CxfEndpoint.class);
CxfProducer producer = (CxfProducer)cxfEndpoint.createProducer();
assertNotNull("The producer should not be null", producer);
producer.start();
@@ -41,7 +41,7 @@ public class CamelEndpointSpringConfigur
assertTrue("we should get SpringCamelContext here", conduit.getCamelContext() instanceof SpringCamelContext);
assertEquals("The context id should be camel_conduit", "camel_conduit", conduit.getCamelContext().getName());
- cxfEndpoint = (CxfEndpoint) context.getEndpoint("cxf:bean:routerEndpoint");
+ cxfEndpoint = context.getEndpoint("cxf:bean:routerEndpoint", CxfEndpoint.class);
CxfConsumer consumer = (CxfConsumer)cxfEndpoint.createConsumer(new Processor() {
public void process(Exchange exchange) throws Exception {
// do nothing here
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java Mon Dec 12 08:57:03 2011
@@ -449,8 +449,7 @@ public class CxfMessageHeadersRelayTest
@Test
public void testMessageHeadersRelaysSpringContext() throws Exception {
- CxfEndpoint endpoint = (CxfEndpoint)context
- .getEndpoint("cxf:bean:serviceExtraRelays?headerFilterStrategy=#customMessageFilterStrategy");
+ CxfEndpoint endpoint = context.getEndpoint("cxf:bean:serviceExtraRelays?headerFilterStrategy=#customMessageFilterStrategy", CxfEndpoint.class);
CxfHeaderFilterStrategy strategy = (CxfHeaderFilterStrategy)endpoint.getHeaderFilterStrategy();
List<MessageHeaderFilter> filters = strategy.getMessageHeaderFilters();
assertEquals("Expected number of filters ", 2, filters.size());
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanBusSettingTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanBusSettingTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanBusSettingTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanBusSettingTest.java Mon Dec 12 08:57:03 2011
@@ -41,7 +41,7 @@ public class CxfEndpointBeanBusSettingTe
public void testBusInjectedBySpring() throws Exception {
CamelContext camelContext = (CamelContext) ctx.getBean("camel");
- CxfEndpoint endpoint = (CxfEndpoint)camelContext.getEndpoint("cxf:bean:routerEndpoint");
+ CxfEndpoint endpoint = camelContext.getEndpoint("cxf:bean:routerEndpoint", CxfEndpoint.class);
assertEquals("Get a wrong endpoint uri", "cxf://bean:routerEndpoint", endpoint.getEndpointUri());
Bus cxf1 = endpoint.getBus();
@@ -49,7 +49,7 @@ public class CxfEndpointBeanBusSettingTe
assertEquals(cxf1, endpoint.getBus());
assertEquals("barf", endpoint.getBus().getProperty("foo"));
- endpoint = (CxfEndpoint)camelContext.getEndpoint("cxf:bean:serviceEndpoint");
+ endpoint = camelContext.getEndpoint("cxf:bean:serviceEndpoint", CxfEndpoint.class);
assertEquals("Get a wrong endpoint uri", "cxf://bean:serviceEndpoint", endpoint.getEndpointUri());
Bus cxf2 = endpoint.getBus();
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanTest.java Mon Dec 12 08:57:03 2011
@@ -45,7 +45,7 @@ public class CxfEndpointBeanTest extends
@Test
public void testCxfEndpointBeanDefinitionParser() {
- CxfEndpoint routerEndpoint = (CxfEndpoint)ctx.getBean("routerEndpoint");
+ CxfEndpoint routerEndpoint = ctx.getBean("routerEndpoint", CxfEndpoint.class);
assertEquals("Got the wrong endpoint address", "http://localhost:" + port1
+ "/CxfEndpointBeanTest/router", routerEndpoint.getAddress());
assertEquals("Got the wrong endpont service class", "org.apache.camel.component.cxf.HelloService",
@@ -56,7 +56,7 @@ public class CxfEndpointBeanTest extends
assertEquals("Got the wrong schemalocations size", 1, routerEndpoint.getSchemaLocations().size());
assertEquals("Got the wrong schemalocation", "classpath:wsdl/Message.xsd", routerEndpoint.getSchemaLocations().get(0));
- CxfEndpoint myEndpoint = (CxfEndpoint)ctx.getBean("myEndpoint");
+ CxfEndpoint myEndpoint = ctx.getBean("myEndpoint", CxfEndpoint.class);
assertEquals("Got the wrong endpointName", endpointName, myEndpoint.getPortName());
assertEquals("Got the wrong serviceName", serviceName, myEndpoint.getServiceName());
assertEquals("loggingFeatureEnabled should be true", true, myEndpoint.isLoggingFeatureEnabled());
@@ -69,7 +69,7 @@ public class CxfEndpointBeanTest extends
@Test
public void testPropertiesSettingOnCxfClient() throws Exception {
- CxfEndpoint clientEndpoint = (CxfEndpoint)ctx.getBean("clientEndpoint");
+ CxfEndpoint clientEndpoint = ctx.getBean("clientEndpoint", CxfEndpoint.class);
CxfProducer producer = (CxfProducer) clientEndpoint.createProducer();
Client client = producer.getClient();
HTTPConduit conduit = (HTTPConduit)client.getConduit();
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanWithBusTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanWithBusTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanWithBusTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanWithBusTest.java Mon Dec 12 08:57:03 2011
@@ -40,8 +40,8 @@ public class CxfEndpointBeanWithBusTest
@Test
public void testBusInjectedBySpring() throws Exception {
- CamelContext camelContext = (CamelContext) ctx.getBean("camel");
- CxfEndpoint endpoint = (CxfEndpoint)camelContext.getEndpoint("cxf:bean:routerEndpoint");
+ CamelContext camelContext = ctx.getBean("camel", CamelContext.class);
+ CxfEndpoint endpoint = camelContext.getEndpoint("cxf:bean:routerEndpoint", CxfEndpoint.class);
// verify the interceptor that is added by the logging feature
// Spring 3.0.0 has an issue of SPR-6589 which will call the BusApplicationListener twice for the same event,
@@ -52,7 +52,7 @@ public class CxfEndpointBeanWithBusTest
@Test
public void testCxfEndpointBeanDefinitionParser() {
- CxfEndpoint routerEndpoint = (CxfEndpoint)ctx.getBean("routerEndpoint");
+ CxfEndpoint routerEndpoint = ctx.getBean("routerEndpoint", CxfEndpoint.class);
assertEquals("Got the wrong endpoint address", "http://localhost:" + port1
+ "/CxfEndpointBeanWithBusTest/router/", routerEndpoint.getAddress());
assertEquals("Got the wrong endpont service class",
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeansRouterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeansRouterTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeansRouterTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeansRouterTest.java Mon Dec 12 08:57:03 2011
@@ -41,7 +41,7 @@ public class CxfEndpointBeansRouterTest
@Test
public void testCxfEndpointBeanDefinitionParser() {
- CxfEndpoint routerEndpoint = (CxfEndpoint)ctx.getBean("routerEndpoint");
+ CxfEndpoint routerEndpoint = ctx.getBean("routerEndpoint", CxfEndpoint.class);
assertEquals("Got the wrong endpoint address", routerEndpoint.getAddress(),
"http://localhost:" + CXFTestSupport.getPort1() + "/CxfEndpointBeansRouterTest/router");
assertEquals("Got the wrong endpont service class",
@@ -51,11 +51,9 @@ public class CxfEndpointBeansRouterTest
@Test
public void testCreateCxfEndpointFromURI() {
- CamelContext camelContext = (CamelContext) ctx.getBean("camel");
- CxfEndpoint endpoint1 = (CxfEndpoint)
- camelContext.getEndpoint("cxf:bean:routerEndpoint?address=http://localhost:9000/test1");
- CxfEndpoint endpoint2 = (CxfEndpoint)
- camelContext.getEndpoint("cxf:bean:routerEndpoint?address=http://localhost:8000/test2");
+ CamelContext camelContext = ctx.getBean("camel", CamelContext.class);
+ CxfEndpoint endpoint1 = camelContext.getEndpoint("cxf:bean:routerEndpoint?address=http://localhost:9000/test1", CxfEndpoint.class);
+ CxfEndpoint endpoint2 = camelContext.getEndpoint("cxf:bean:routerEndpoint?address=http://localhost:8000/test2", CxfEndpoint.class);
assertEquals("Get a wrong endpoint address.", "http://localhost:9000/test1", endpoint1.getAddress());
assertEquals("Get a wrong endpoint address.", "http://localhost:8000/test2", endpoint2.getAddress());
assertEquals("Get a wrong endpoint key.", "cxf://bean:routerEndpoint?address=http://localhost:9000/test1", endpoint1.getEndpointKey());
@@ -65,7 +63,7 @@ public class CxfEndpointBeansRouterTest
@Test
public void testCxfBusConfiguration() throws Exception {
// get the camelContext from application context
- CamelContext camelContext = (CamelContext) ctx.getBean("camel");
+ CamelContext camelContext = ctx.getBean("camel", CamelContext.class);
ProducerTemplate template = camelContext.createProducerTemplate();
Exchange reply = template.request("cxf:bean:serviceEndpoint", new Processor() {
@@ -86,8 +84,8 @@ public class CxfEndpointBeansRouterTest
@Test
public void testCxfBeanWithCamelPropertiesHolder() throws Exception {
// get the camelContext from application context
- CamelContext camelContext = (CamelContext) ctx.getBean("camel");
- CxfEndpoint testEndpoint = (CxfEndpoint)camelContext.getEndpoint("cxf:bean:testEndpoint");
+ CamelContext camelContext = ctx.getBean("camel", CamelContext.class);
+ CxfEndpoint testEndpoint = camelContext.getEndpoint("cxf:bean:testEndpoint", CxfEndpoint.class);
QName endpointName = QName.valueOf("{http://org.apache.camel.component.cxf}myEndpoint");
QName serviceName = QName.valueOf("{http://org.apache.camel.component.cxf}myService");
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanTest.java Mon Dec 12 08:57:03 2011
@@ -30,7 +30,7 @@ public class CxfRsClientFactoryBeanTest
@Test
public void testCxfRsClientFactoryBean() {
- SpringJAXRSClientFactoryBean cfb = (SpringJAXRSClientFactoryBean) ctx.getBean("rsClient1");
+ SpringJAXRSClientFactoryBean cfb = ctx.getBean("rsClient1", SpringJAXRSClientFactoryBean.class);
assertEquals("Get a wrong address", cfb.getAddress(), "http://localhost:" + port + "/CxfRsClientFactoryBeanTest/router");
assertEquals("Get a wrong beanId", cfb.getBeanId(), "rsClient1");
assertEquals("Get a wrong password", cfb.getPassword(), "passwd");
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanTest.java Mon Dec 12 08:57:03 2011
@@ -32,13 +32,13 @@ public class CxfRsServerFactoryBeanTest
@Test
public void testCxfRsServerFactoryBean() {
- SpringJAXRSServerFactoryBean sfb1 = (SpringJAXRSServerFactoryBean) ctx.getBean("rsServer1");
+ SpringJAXRSServerFactoryBean sfb1 = ctx.getBean("rsServer1", SpringJAXRSServerFactoryBean.class);
assertEquals("Get a wrong address", sfb1.getAddress(), "http://localhost:" + port + "/CxfRsServerFactoryBeanTest/server1");
List<Class<?>> resource1Classes = sfb1.getResourceClasses();
assertEquals("Get a wrong size of resouceClasses", resource1Classes.size(), 1);
assertEquals("Get a wrong resource class", resource1Classes.get(0), CustomerService.class);
- SpringJAXRSServerFactoryBean sfb2 = (SpringJAXRSServerFactoryBean) ctx.getBean("rsServer2");
+ SpringJAXRSServerFactoryBean sfb2 = ctx.getBean("rsServer2", SpringJAXRSServerFactoryBean.class);
assertEquals("Get a wrong address", sfb2.getAddress(), "http://localhost:" + port + "/CxfRsServerFactoryBeanTest/server2");
sfb2.getResourceClasses();
List<Class<?>> resource2Classes = sfb2.getResourceClasses();
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/SpringBusFactoryBeanTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/SpringBusFactoryBeanTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/SpringBusFactoryBeanTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/SpringBusFactoryBeanTest.java Mon Dec 12 08:57:03 2011
@@ -29,10 +29,10 @@ public class SpringBusFactoryBeanTest ex
@Test
public void getTheBusInstance() {
- Bus bus = (Bus)ctx.getBean("cxfBus");
+ Bus bus = ctx.getBean("cxfBus", Bus.class);
assertNotNull("The bus should not be null", bus);
- bus = (Bus)ctx.getBean("myBus");
+ bus = ctx.getBean("myBus", Bus.class);
assertNotNull("The bus should not be null", bus);
SoapBindingFactory soapBindingFactory = bus.getExtension(SoapBindingFactory.class);
Modified: camel/trunk/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerEndpoint.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerEndpoint.java (original)
+++ camel/trunk/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/FreemarkerEndpoint.java Mon Dec 12 08:57:03 2011
@@ -87,7 +87,7 @@ public class FreemarkerEndpoint extends
public FreemarkerEndpoint findOrCreateEndpoint(String uri, String newResourceUri) {
String newUri = uri.replace(getResourceUri(), newResourceUri);
log.debug("Getting endpoint with URI: {}", newUri);
- return (FreemarkerEndpoint) getCamelContext().getEndpoint(newUri);
+ return getCamelContext().getEndpoint(newUri, FreemarkerEndpoint.class);
}
@Override
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/UriConfigurationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/UriConfigurationTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/UriConfigurationTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/UriConfigurationTest.java Mon Dec 12 08:57:03 2011
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.file.remote;
-import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.test.junit4.CamelTestSupport;
@@ -29,10 +28,8 @@ public class UriConfigurationTest extend
@Test
public void testFtpConfigurationDefaults() {
- Endpoint endpoint = context.getEndpoint("ftp://hostname");
- assertIsInstanceOf(FtpEndpoint.class, endpoint);
- FtpEndpoint ftpEndpoint = (FtpEndpoint) endpoint;
- RemoteFileConfiguration config = ftpEndpoint.getConfiguration();
+ FtpEndpoint endpoint = context.getEndpoint("ftp://hostname", FtpEndpoint.class);
+ RemoteFileConfiguration config = endpoint.getConfiguration();
assertEquals("ftp", config.getProtocol());
assertEquals("hostname", config.getHost());
@@ -45,10 +42,8 @@ public class UriConfigurationTest extend
@Test
public void testSftpConfigurationDefaults() {
- Endpoint endpoint = context.getEndpoint("sftp://hostname");
- assertIsInstanceOf(SftpEndpoint.class, endpoint);
- SftpEndpoint sftpEndpoint = (SftpEndpoint) endpoint;
- RemoteFileConfiguration config = sftpEndpoint.getConfiguration();
+ SftpEndpoint endpoint = context.getEndpoint("sftp://hostname", SftpEndpoint.class);
+ RemoteFileConfiguration config = endpoint.getConfiguration();
assertEquals("sftp", config.getProtocol());
assertEquals("hostname", config.getHost());
@@ -61,10 +56,8 @@ public class UriConfigurationTest extend
@Test
public void testFtpsConfigurationDefaults() {
- Endpoint endpoint = context.getEndpoint("ftps://hostname");
- assertIsInstanceOf(FtpsEndpoint.class, endpoint);
- FtpsEndpoint ftpsEndpoint = (FtpsEndpoint) endpoint;
- FtpsConfiguration config = (FtpsConfiguration) ftpsEndpoint.getConfiguration();
+ FtpsEndpoint endpoint = context.getEndpoint("ftps://hostname", FtpsEndpoint.class);
+ FtpsConfiguration config = endpoint.getFtpsConfiguration();
assertEquals("ftps", config.getProtocol());
assertEquals("hostname", config.getHost());
@@ -79,10 +72,8 @@ public class UriConfigurationTest extend
@Test
public void testFtpsExplicitConfigurationDefaults() {
- Endpoint endpoint = context.getEndpoint("ftps://hostname:990?isImplicit=true");
- assertIsInstanceOf(FtpsEndpoint.class, endpoint);
- FtpsEndpoint ftpsEndpoint = (FtpsEndpoint) endpoint;
- FtpsConfiguration config = (FtpsConfiguration) ftpsEndpoint.getConfiguration();
+ FtpsEndpoint endpoint = context.getEndpoint("ftps://hostname:990?isImplicit=true", FtpsEndpoint.class);
+ FtpsConfiguration config = endpoint.getFtpsConfiguration();
assertEquals("ftps", config.getProtocol());
assertEquals("hostname", config.getHost());
@@ -96,10 +87,8 @@ public class UriConfigurationTest extend
@Test
public void testFtpExplicitConfiguration() {
- Endpoint endpoint = context.getEndpoint("ftp://user@hostname:1021/some/file?password=secret&binary=true");
- assertIsInstanceOf(FtpEndpoint.class, endpoint);
- FtpEndpoint ftpEndpoint = (FtpEndpoint) endpoint;
- RemoteFileConfiguration config = ftpEndpoint.getConfiguration();
+ FtpEndpoint endpoint = context.getEndpoint("ftp://user@hostname:1021/some/file?password=secret&binary=true", FtpEndpoint.class);
+ RemoteFileConfiguration config = endpoint.getConfiguration();
assertEquals("ftp", config.getProtocol());
assertEquals("hostname", config.getHost());
@@ -111,10 +100,8 @@ public class UriConfigurationTest extend
@Test
public void testSftpExplicitConfiguration() {
- Endpoint endpoint = context.getEndpoint("sftp://user@hostname:1021/some/file?password=secret&binary=true");
- assertIsInstanceOf(SftpEndpoint.class, endpoint);
- SftpEndpoint sftpEndpoint = (SftpEndpoint) endpoint;
- RemoteFileConfiguration config = sftpEndpoint.getConfiguration();
+ SftpEndpoint endpoint = context.getEndpoint("sftp://user@hostname:1021/some/file?password=secret&binary=true", SftpEndpoint.class);
+ RemoteFileConfiguration config = endpoint.getConfiguration();
assertEquals("sftp", config.getProtocol());
assertEquals("hostname", config.getHost());
@@ -126,10 +113,8 @@ public class UriConfigurationTest extend
@Test
public void testFtpsExplicitConfiguration() {
- Endpoint endpoint = context.getEndpoint("ftps://user@hostname:1021/some/file?password=secret&binary=true&securityProtocol=SSL&isImplicit=true");
- assertIsInstanceOf(FtpsEndpoint.class, endpoint);
- FtpsEndpoint sftpEndpoint = (FtpsEndpoint) endpoint;
- FtpsConfiguration config = (FtpsConfiguration) sftpEndpoint.getConfiguration();
+ FtpsEndpoint endpoint = context.getEndpoint("ftps://user@hostname:1021/some/file?password=secret&binary=true&securityProtocol=SSL&isImplicit=true", FtpsEndpoint.class);
+ FtpsConfiguration config = endpoint.getFtpsConfiguration();
assertEquals("ftps", config.getProtocol());
assertEquals("hostname", config.getHost());
@@ -186,10 +171,8 @@ public class UriConfigurationTest extend
@Test
public void testSftpKnownHostsFileConfiguration() {
- Endpoint endpoint = context.getEndpoint("sftp://user@hostname:1021/some/file?password=secret&binary=true&knownHostsFile=/home/janstey/.ssh/known_hosts");
- assertIsInstanceOf(SftpEndpoint.class, endpoint);
- SftpEndpoint sftpEndpoint = (SftpEndpoint) endpoint;
- SftpConfiguration config = (SftpConfiguration) sftpEndpoint.getConfiguration();
+ SftpEndpoint endpoint = context.getEndpoint("sftp://user@hostname:1021/some/file?password=secret&binary=true&knownHostsFile=/home/janstey/.ssh/known_hosts", SftpEndpoint.class);
+ SftpConfiguration config = endpoint.getConfiguration();
assertEquals("sftp", config.getProtocol());
assertEquals("hostname", config.getHost());
@@ -202,10 +185,8 @@ public class UriConfigurationTest extend
@Test
public void testPasswordInContextPathConfiguration() {
- Endpoint endpoint = context.getEndpoint("ftp://user:secret@hostname:1021/some/file");
- assertIsInstanceOf(FtpEndpoint.class, endpoint);
- FtpEndpoint ftpEndpoint = (FtpEndpoint) endpoint;
- RemoteFileConfiguration config = ftpEndpoint.getConfiguration();
+ FtpEndpoint endpoint = context.getEndpoint("ftp://user:secret@hostname:1021/some/file", FtpEndpoint.class);
+ RemoteFileConfiguration config = endpoint.getConfiguration();
assertEquals("ftp", config.getProtocol());
assertEquals("hostname", config.getHost());
@@ -216,12 +197,11 @@ public class UriConfigurationTest extend
@Test
public void testStartingDirectoryWithDot() throws Exception {
- Endpoint endpoint = context.getEndpoint("ftp://user@hostname?password=secret");
- FtpEndpoint ftpEndpoint = assertIsInstanceOf(FtpEndpoint.class, endpoint);
- FtpConfiguration config = ftpEndpoint.getConfiguration();
+ FtpEndpoint endpoint = context.getEndpoint("ftp://user@hostname?password=secret", FtpEndpoint.class);
+ FtpConfiguration config = endpoint.getConfiguration();
config.setHost("somewhere");
config.setDirectory("temp.dir");
- ftpEndpoint.createConsumer(new Processor() {
+ endpoint.createConsumer(new Processor() {
public void process(Exchange exchange) throws Exception {
// do nothing
}
@@ -230,10 +210,8 @@ public class UriConfigurationTest extend
@Test
public void testPathSeparatorAuto() {
- Endpoint endpoint = context.getEndpoint("ftp://hostname/foo/bar?separator=Auto");
- assertIsInstanceOf(FtpEndpoint.class, endpoint);
- FtpEndpoint ftpEndpoint = (FtpEndpoint) endpoint;
- RemoteFileConfiguration config = ftpEndpoint.getConfiguration();
+ FtpEndpoint endpoint = context.getEndpoint("ftp://hostname/foo/bar?separator=Auto", FtpEndpoint.class);
+ RemoteFileConfiguration config = endpoint.getConfiguration();
assertEquals("ftp", config.getProtocol());
assertEquals("hostname", config.getHost());
@@ -246,10 +224,8 @@ public class UriConfigurationTest extend
@Test
public void testPathSeparatorUnix() {
- Endpoint endpoint = context.getEndpoint("ftp://hostname/foo/bar?separator=UNIX");
- assertIsInstanceOf(FtpEndpoint.class, endpoint);
- FtpEndpoint ftpEndpoint = (FtpEndpoint) endpoint;
- RemoteFileConfiguration config = ftpEndpoint.getConfiguration();
+ FtpEndpoint endpoint = context.getEndpoint("ftp://hostname/foo/bar?separator=UNIX", FtpEndpoint.class);
+ RemoteFileConfiguration config = endpoint.getConfiguration();
assertEquals("ftp", config.getProtocol());
assertEquals("hostname", config.getHost());
@@ -262,10 +238,8 @@ public class UriConfigurationTest extend
@Test
public void testPathSeparatorWindows() {
- Endpoint endpoint = context.getEndpoint("ftp://hostname/foo/bar?separator=Windows");
- assertIsInstanceOf(FtpEndpoint.class, endpoint);
- FtpEndpoint ftpEndpoint = (FtpEndpoint) endpoint;
- RemoteFileConfiguration config = ftpEndpoint.getConfiguration();
+ FtpEndpoint endpoint = context.getEndpoint("ftp://hostname/foo/bar?separator=Windows", FtpEndpoint.class);
+ RemoteFileConfiguration config = endpoint.getConfiguration();
assertEquals("ftp", config.getProtocol());
assertEquals("hostname", config.getHost());
Modified: camel/trunk/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsConsumerTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsConsumerTest.java (original)
+++ camel/trunk/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsConsumerTest.java Mon Dec 12 08:57:03 2011
@@ -87,7 +87,7 @@ public class HdfsConsumerTest extends Ca
from("hdfs:///" + file.toUri() + "?fileSystemType=LOCAL&chunkSize=4096&initialDelay=0").to("mock:result");
}
});
- MockEndpoint resultEndpoint = (MockEndpoint) context.getEndpoint("mock:result");
+ MockEndpoint resultEndpoint = context.getEndpoint("mock:result", MockEndpoint.class);
resultEndpoint.expectedMessageCount(2);
context.start();
@@ -118,7 +118,7 @@ public class HdfsConsumerTest extends Ca
});
context.start();
- MockEndpoint resultEndpoint = (MockEndpoint) context.getEndpoint("mock:result");
+ MockEndpoint resultEndpoint = context.getEndpoint("mock:result", MockEndpoint.class);
resultEndpoint.expectedMessageCount(1);
resultEndpoint.assertIsSatisfied();
}
@@ -147,7 +147,7 @@ public class HdfsConsumerTest extends Ca
}
});
context.start();
- MockEndpoint resultEndpoint = (MockEndpoint) context.getEndpoint("mock:result");
+ MockEndpoint resultEndpoint = context.getEndpoint("mock:result", MockEndpoint.class);
resultEndpoint.expectedMessageCount(1);
List<Exchange> exchanges = resultEndpoint.getReceivedExchanges();
@@ -182,7 +182,7 @@ public class HdfsConsumerTest extends Ca
});
context.start();
- MockEndpoint resultEndpoint = (MockEndpoint) context.getEndpoint("mock:result");
+ MockEndpoint resultEndpoint = context.getEndpoint("mock:result", MockEndpoint.class);
resultEndpoint.expectedMessageCount(1);
resultEndpoint.assertIsSatisfied();
}
@@ -211,7 +211,7 @@ public class HdfsConsumerTest extends Ca
});
context.start();
- MockEndpoint resultEndpoint = (MockEndpoint) context.getEndpoint("mock:result");
+ MockEndpoint resultEndpoint = context.getEndpoint("mock:result", MockEndpoint.class);
resultEndpoint.expectedMessageCount(1);
resultEndpoint.assertIsSatisfied();
}
@@ -241,7 +241,7 @@ public class HdfsConsumerTest extends Ca
});
context.start();
- MockEndpoint resultEndpoint = (MockEndpoint) context.getEndpoint("mock:result");
+ MockEndpoint resultEndpoint = context.getEndpoint("mock:result", MockEndpoint.class);
resultEndpoint.expectedMessageCount(1);
resultEndpoint.assertIsSatisfied();
}
@@ -271,7 +271,7 @@ public class HdfsConsumerTest extends Ca
});
context.start();
- MockEndpoint resultEndpoint = (MockEndpoint) context.getEndpoint("mock:result");
+ MockEndpoint resultEndpoint = context.getEndpoint("mock:result", MockEndpoint.class);
resultEndpoint.expectedMessageCount(1);
resultEndpoint.assertIsSatisfied();
}
@@ -301,7 +301,7 @@ public class HdfsConsumerTest extends Ca
});
context.start();
- MockEndpoint resultEndpoint = (MockEndpoint) context.getEndpoint("mock:result");
+ MockEndpoint resultEndpoint = context.getEndpoint("mock:result", MockEndpoint.class);
resultEndpoint.expectedMessageCount(1);
resultEndpoint.assertIsSatisfied();
}
@@ -331,7 +331,7 @@ public class HdfsConsumerTest extends Ca
});
context.start();
- MockEndpoint resultEndpoint = (MockEndpoint) context.getEndpoint("mock:result");
+ MockEndpoint resultEndpoint = context.getEndpoint("mock:result", MockEndpoint.class);
resultEndpoint.expectedMessageCount(1);
resultEndpoint.assertIsSatisfied();
}
@@ -363,7 +363,7 @@ public class HdfsConsumerTest extends Ca
});
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/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerConsumerTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerConsumerTest.java (original)
+++ camel/trunk/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerConsumerTest.java Mon Dec 12 08:57:03 2011
@@ -67,7 +67,7 @@ public class HdfsProducerConsumerTest ex
template.sendBody("direct:start", "CIAO" + i);
}
- MockEndpoint resultEndpoint = (MockEndpoint) context.getEndpoint("mock:result");
+ MockEndpoint resultEndpoint = context.getEndpoint("mock:result", MockEndpoint.class);
resultEndpoint.expectedMessageCount(10);
resultEndpoint.assertIsSatisfied();
Modified: camel/trunk/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/integration/HdfsProducerConsumerIntegrationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/integration/HdfsProducerConsumerIntegrationTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/integration/HdfsProducerConsumerIntegrationTest.java (original)
+++ camel/trunk/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/integration/HdfsProducerConsumerIntegrationTest.java Mon Dec 12 08:57:03 2011
@@ -54,7 +54,7 @@ public class HdfsProducerConsumerIntegra
template.sendBody("direct:start", "CIAO" + i);
}
- MockEndpoint resultEndpoint = (MockEndpoint) context.getEndpoint("mock:result");
+ MockEndpoint resultEndpoint = context.getEndpoint("mock:result", MockEndpoint.class);
resultEndpoint.expectedMessageCount(10);
resultEndpoint.assertIsSatisfied();
Modified: camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpReferenceParameterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpReferenceParameterTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpReferenceParameterTest.java (original)
+++ camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpReferenceParameterTest.java Mon Dec 12 08:57:03 2011
@@ -41,8 +41,8 @@ public class HttpReferenceParameterTest
this.testBinding = new TestHttpBinding();
this.testConfigurer = new TestClientConfigurer();
super.setUp();
- this.endpoint1 = (HttpEndpoint)context.getEndpoint(TEST_URI_1);
- this.endpoint2 = (HttpEndpoint)context.getEndpoint(TEST_URI_2);
+ this.endpoint1 = context.getEndpoint(TEST_URI_1, HttpEndpoint.class);
+ this.endpoint2 = context.getEndpoint(TEST_URI_2, HttpEndpoint.class);
}
@Test
Modified: camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpReferenceParameterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpReferenceParameterTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpReferenceParameterTest.java (original)
+++ camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpReferenceParameterTest.java Mon Dec 12 08:57:03 2011
@@ -43,8 +43,8 @@ public class HttpReferenceParameterTest
this.testBinding = new TestHttpBinding();
this.testConfigurer = new TestClientConfigurer();
super.setUp();
- this.endpoint1 = (HttpEndpoint) context.getEndpoint(TEST_URI_1);
- this.endpoint2 = (HttpEndpoint) context.getEndpoint(TEST_URI_2);
+ this.endpoint1 = context.getEndpoint(TEST_URI_1, HttpEndpoint.class);
+ this.endpoint2 = context.getEndpoint(TEST_URI_2, HttpEndpoint.class);
}
@Test
Modified: camel/trunk/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcMultiChannelRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcMultiChannelRouteTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcMultiChannelRouteTest.java (original)
+++ camel/trunk/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcMultiChannelRouteTest.java Mon Dec 12 08:57:03 2011
@@ -39,7 +39,7 @@ public class IrcMultiChannelRouteTest ex
@Ignore("test manual")
@Test
public void testIrcMessages() throws Exception {
- resultEndpoint = (MockEndpoint) context.getEndpoint("mock:result");
+ resultEndpoint = context.getEndpoint("mock:result", MockEndpoint.class);
//consumer is going to receive two copies of body3
resultEndpoint.expectedBodiesReceived(body1, body2, body3, body3);
Modified: camel/trunk/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcOnReplyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcOnReplyTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcOnReplyTest.java (original)
+++ camel/trunk/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcOnReplyTest.java Mon Dec 12 08:57:03 2011
@@ -38,7 +38,7 @@ public class IrcOnReplyTest extends Came
@Ignore("test manual")
@Test
public void testIrcMessages() throws Exception {
- resultEndpoint = (MockEndpoint) context.getEndpoint("mock:result");
+ resultEndpoint = context.getEndpoint("mock:result", MockEndpoint.class);
resultEndpoint.expectedBodiesReceived(resultEnd);
resultEndpoint.assertIsSatisfied();
Modified: camel/trunk/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcPrivmsgTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcPrivmsgTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcPrivmsgTest.java (original)
+++ camel/trunk/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcPrivmsgTest.java Mon Dec 12 08:57:03 2011
@@ -43,7 +43,7 @@ public class IrcPrivmsgTest extends Came
@Ignore("test manual")
@Test
public void testIrcPrivateMessages() throws Exception {
- resultEndpoint = (MockEndpoint) context.getEndpoint("mock:result");
+ resultEndpoint = context.getEndpoint("mock:result", MockEndpoint.class);
resultEndpoint.expectedBodiesReceived(expectedBody1, expectedBody2);
resultEndpoint.assertIsSatisfied();
Modified: camel/trunk/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcRouteTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcRouteTest.java (original)
+++ camel/trunk/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcRouteTest.java Mon Dec 12 08:57:03 2011
@@ -37,7 +37,7 @@ public class IrcRouteTest extends CamelT
@Test
public void testIrcMessages() throws Exception {
- resultEndpoint = (MockEndpoint) context.getEndpoint("mock:result");
+ resultEndpoint = context.getEndpoint("mock:result", MockEndpoint.class);
resultEndpoint.expectedBodiesReceived(body1, body2);
resultEndpoint.assertIsSatisfied();
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBridgeMultipartRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBridgeMultipartRouteTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBridgeMultipartRouteTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBridgeMultipartRouteTest.java Mon Dec 12 08:57:03 2011
@@ -85,7 +85,7 @@ public class HttpBridgeMultipartRouteTes
}
};
- HttpEndpoint epOut = (HttpEndpoint) getContext().getEndpoint("http://localhost:" + port1 + "?bridgeEndpoint=true&throwExceptionOnFailure=false");
+ HttpEndpoint epOut = getContext().getEndpoint("http://localhost:" + port1 + "?bridgeEndpoint=true&throwExceptionOnFailure=false", HttpEndpoint.class);
epOut.setHeaderFilterStrategy(new MultipartHeaderFilterStrategy());
from("jetty:http://localhost:" + port2 + "/test/hello?enableMultipartFilter=false")
Modified: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java (original)
+++ camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java Mon Dec 12 08:57:03 2011
@@ -129,16 +129,14 @@ public class JmsComponent extends Defaul
// If we are being configured with spring...
if (applicationContext != null) {
- Map<String, Object> beansOfType =
- CastUtils.cast(applicationContext.getBeansOfType(ConnectionFactory.class));
- if (!beansOfType.isEmpty()) {
- ConnectionFactory cf = (ConnectionFactory)beansOfType.values().iterator().next();
+ Map<String, ConnectionFactory> beansOfTypeConnectionFactory = applicationContext.getBeansOfType(ConnectionFactory.class);
+ if (!beansOfTypeConnectionFactory.isEmpty()) {
+ ConnectionFactory cf = beansOfTypeConnectionFactory.values().iterator().next();
configuration.setConnectionFactory(cf);
}
- beansOfType = CastUtils.cast(applicationContext.getBeansOfType(DestinationResolver.class));
- if (!beansOfType.isEmpty()) {
- DestinationResolver destinationResolver = (DestinationResolver)beansOfType.values()
- .iterator().next();
+ Map<String, DestinationResolver> beansOfTypeDestinationResolver = applicationContext.getBeansOfType(DestinationResolver.class);
+ if (!beansOfTypeDestinationResolver.isEmpty()) {
+ DestinationResolver destinationResolver = beansOfTypeDestinationResolver.values().iterator().next();
configuration.setDestinationResolver(destinationResolver);
}
}
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDestinationResolverTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDestinationResolverTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDestinationResolverTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDestinationResolverTest.java Mon Dec 12 08:57:03 2011
@@ -62,7 +62,7 @@ public class JmsDestinationResolverTest
super.setUp();
- resultEndpoint = (MockEndpoint) context.getEndpoint("mock:result");
+ resultEndpoint = context.getEndpoint("mock:result", MockEndpoint.class);
}
@Override
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsQosRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsQosRouteTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsQosRouteTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsQosRouteTest.java Mon Dec 12 08:57:03 2011
@@ -35,11 +35,11 @@ public class JmsQosRouteTest extends Cam
@Test
public void testJmsRoutePreserveQos() throws Exception {
- MockEndpoint preserveEndpoint1 = (MockEndpoint) context.getEndpoint("mock:preserve-1");
+ MockEndpoint preserveEndpoint1 = context.getEndpoint("mock:preserve-1", MockEndpoint.class);
preserveEndpoint1.expectedMessageCount(1);
preserveEndpoint1.message(0).header("JMSPriority").isEqualTo(1);
- MockEndpoint preserveEndpoint2 = (MockEndpoint) context.getEndpoint("mock:preserve-2");
+ MockEndpoint preserveEndpoint2 = context.getEndpoint("mock:preserve-2", MockEndpoint.class);
preserveEndpoint2.expectedMessageCount(1);
preserveEndpoint2.message(0).header("JMSPriority").isEqualTo(2);
@@ -52,11 +52,11 @@ public class JmsQosRouteTest extends Cam
@Test
public void testJmsRouteNormalQos() throws Exception {
- MockEndpoint regularEndpoint1 = (MockEndpoint) context.getEndpoint("mock:regular-1");
+ MockEndpoint regularEndpoint1 = context.getEndpoint("mock:regular-1", MockEndpoint.class);
regularEndpoint1.expectedMessageCount(1);
regularEndpoint1.message(0).header("JMSPriority").isEqualTo(4);
- MockEndpoint regularEndpoint2 = (MockEndpoint) context.getEndpoint("mock:regular-2");
+ MockEndpoint regularEndpoint2 = context.getEndpoint("mock:regular-2", MockEndpoint.class);
regularEndpoint2.expectedMessageCount(1);
regularEndpoint2.message(0).header("JMSPriority").isEqualTo(4);
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteTest.java Mon Dec 12 08:57:03 2011
@@ -61,7 +61,7 @@ public class JmsRouteTest extends CamelT
super.setUp();
- resultEndpoint = (MockEndpoint) context.getEndpoint("mock:result");
+ resultEndpoint = context.getEndpoint("mock:result", MockEndpoint.class);
}
protected CamelContext createCamelContext() throws Exception {
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/remoting/JmsRemotingTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/remoting/JmsRemotingTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/remoting/JmsRemotingTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/remoting/JmsRemotingTest.java Mon Dec 12 08:57:03 2011
@@ -36,7 +36,7 @@ public class JmsRemotingTest extends Cam
@Test
public void testRemoting() throws Exception {
- ISay proxy = (ISay) applicationContext.getBean("sayProxy");
+ ISay proxy = applicationContext.getBean("sayProxy", ISay.class);
String rc = proxy.say();
assertEquals("Hello", rc);
}
Modified: camel/trunk/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/JMXComponentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/JMXComponentTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/JMXComponentTest.java (original)
+++ camel/trunk/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/JMXComponentTest.java Mon Dec 12 08:57:03 2011
@@ -38,7 +38,7 @@ public class JMXComponentTest {
@Test
public void withObjectProperties() throws Exception {
- JMXEndpoint ep = (JMXEndpoint) context.getEndpoint("jmx:platform?objectDomain=FooDomain&key.propOne=prop1&key.propTwo=prop2");
+ JMXEndpoint ep = context.getEndpoint("jmx:platform?objectDomain=FooDomain&key.propOne=prop1&key.propTwo=prop2", JMXEndpoint.class);
assertNotNull(ep);
Hashtable<String, String> props = ep.getObjectProperties();
@@ -51,7 +51,7 @@ public class JMXComponentTest {
@Test
public void withObjectName() throws Exception {
- JMXEndpoint ep = (JMXEndpoint) context.getEndpoint("jmx:platform?objectDomain=FooDomain&objectName=theObjectName");
+ JMXEndpoint ep = context.getEndpoint("jmx:platform?objectDomain=FooDomain&objectName=theObjectName", JMXEndpoint.class);
assertNotNull(ep);
assertEquals("theObjectName", ep.getObjectName());