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 [2/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-jmx/src/test/java/org/apache/camel/component/jmx/JMXEndpointTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/JMXEndpointTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/JMXEndpointTest.java (original)
+++ camel/trunk/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/JMXEndpointTest.java Mon Dec 12 08:57:03 2011
@@ -62,20 +62,20 @@ public class JMXEndpointTest {
@Test
public void defaultsToXml() 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);
assertTrue(ep.isXML());
}
@Test
public void formatRaw() throws Exception {
- JMXEndpoint ep = (JMXEndpoint) context.getEndpoint("jmx:platform?objectDomain=FooDomain&objectName=theObjectName&format=raw");
+ JMXEndpoint ep = context.getEndpoint("jmx:platform?objectDomain=FooDomain&objectName=theObjectName&format=raw", JMXEndpoint.class);
assertFalse(ep.isXML());
assertEquals("raw", ep.getFormat());
}
@Test
public void getJMXObjectName() 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);
ObjectName on = ep.getJMXObjectName();
assertNotNull(on);
assertEquals("FooDomain:name=theObjectName", on.toString());
@@ -83,7 +83,7 @@ public class JMXEndpointTest {
@Test
public void getJMXObjectNameWithProps() throws Exception {
- JMXEndpoint ep = (JMXEndpoint) context.getEndpoint("jmx:platform?objectDomain=FooDomain&key.name=theObjectName");
+ JMXEndpoint ep = context.getEndpoint("jmx:platform?objectDomain=FooDomain&key.name=theObjectName", JMXEndpoint.class);
ObjectName on = ep.getJMXObjectName();
assertNotNull(on);
assertEquals("FooDomain:name=theObjectName", on.toString());
@@ -91,7 +91,7 @@ public class JMXEndpointTest {
@Test
public void getJMXObjectNameCached() throws Exception {
- JMXEndpoint ep = (JMXEndpoint) context.getEndpoint("jmx:platform?objectDomain=FooDomain&key.name=theObjectName");
+ JMXEndpoint ep = context.getEndpoint("jmx:platform?objectDomain=FooDomain&key.name=theObjectName", JMXEndpoint.class);
ObjectName on = ep.getJMXObjectName();
assertNotNull(on);
assertSame(on, ep.getJMXObjectName());
@@ -99,25 +99,25 @@ public class JMXEndpointTest {
@Test
public void platformServer() throws Exception {
- JMXEndpoint ep = (JMXEndpoint) context.getEndpoint("jmx:platform?objectDomain=FooDomain&key.name=theObjectName");
+ JMXEndpoint ep = context.getEndpoint("jmx:platform?objectDomain=FooDomain&key.name=theObjectName", JMXEndpoint.class);
assertTrue(ep.isPlatformServer());
assertEquals("platform", ep.getServerURL());
}
@Test
public void remoteServer() throws Exception {
- JMXEndpoint ep = (JMXEndpoint) context.getEndpoint("jmx:service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi?objectDomain=FooDomain&key.name=theObjectName");
+ JMXEndpoint ep = context.getEndpoint("jmx:service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi?objectDomain=FooDomain&key.name=theObjectName", JMXEndpoint.class);
assertFalse(ep.isPlatformServer());
assertEquals("service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi", ep.getServerURL());
- ep = (JMXEndpoint) context.getEndpoint("jmx://service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi?objectDomain=FooDomain&key.name=theObjectName");
+ ep = context.getEndpoint("jmx://service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi?objectDomain=FooDomain&key.name=theObjectName", JMXEndpoint.class);
assertFalse(ep.isPlatformServer());
assertEquals("service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi", ep.getServerURL());
}
@Test
public void noProducer() throws Exception {
- JMXEndpoint ep = (JMXEndpoint) context.getEndpoint("jmx:platform?objectDomain=FooDomain&key.name=theObjectName");
+ JMXEndpoint ep = context.getEndpoint("jmx:platform?objectDomain=FooDomain&key.name=theObjectName", JMXEndpoint.class);
try {
ep.createProducer();
fail("producer pattern is not supported");
@@ -127,14 +127,14 @@ public class JMXEndpointTest {
@Test
public void credentials() throws Exception {
- JMXEndpoint ep = (JMXEndpoint) context.getEndpoint("jmx:platform?objectDomain=FooDomain&key.name=theObjectName&user=user1&password=1234");
+ JMXEndpoint ep = context.getEndpoint("jmx:platform?objectDomain=FooDomain&key.name=theObjectName&user=user1&password=1234", JMXEndpoint.class);
assertEquals("user1", ep.getUser());
assertEquals("1234", ep.getPassword());
}
@Test
public void noObservedAttribute() throws Exception {
- JMXEndpoint ep = (JMXEndpoint) context.getEndpoint("jmx:platform?objectDomain=FooDomain&objectName=theObjectName&monitorType=string");
+ JMXEndpoint ep = context.getEndpoint("jmx:platform?objectDomain=FooDomain&objectName=theObjectName&monitorType=string", JMXEndpoint.class);
try {
ep.createConsumer(null);
fail("expected exception");
@@ -145,7 +145,7 @@ public class JMXEndpointTest {
@Test
public void noStringToCompare() throws Exception {
- JMXEndpoint ep = (JMXEndpoint) context.getEndpoint("jmx:platform?objectDomain=FooDomain&objectName=theObjectName&monitorType=string&observedAttribute=foo");
+ JMXEndpoint ep = context.getEndpoint("jmx:platform?objectDomain=FooDomain&objectName=theObjectName&monitorType=string&observedAttribute=foo", JMXEndpoint.class);
try {
ep.createConsumer(null);
fail("expected exception");
@@ -156,7 +156,7 @@ public class JMXEndpointTest {
@Test
public void noNotifyDifferOrNotifyMatch() throws Exception {
- JMXEndpoint ep = (JMXEndpoint) context.getEndpoint("jmx:platform?objectDomain=FooDomain&objectName=theObjectName&monitorType=string&observedAttribute=foo&stringToCompare=foo");
+ JMXEndpoint ep = context.getEndpoint("jmx:platform?objectDomain=FooDomain&objectName=theObjectName&monitorType=string&observedAttribute=foo&stringToCompare=foo", JMXEndpoint.class);
try {
ep.createConsumer(null);
fail("expected exception");
@@ -167,7 +167,7 @@ public class JMXEndpointTest {
@Test
public void noNotifyHighOrNotifyLow() throws Exception {
- JMXEndpoint ep = (JMXEndpoint) context.getEndpoint("jmx:platform?objectDomain=FooDomain&objectName=theObjectName&monitorType=gauge&observedAttribute=foo");
+ JMXEndpoint ep = context.getEndpoint("jmx:platform?objectDomain=FooDomain&objectName=theObjectName&monitorType=gauge&observedAttribute=foo", JMXEndpoint.class);
try {
ep.createConsumer(null);
fail("expected exception");
@@ -178,7 +178,8 @@ public class JMXEndpointTest {
@Test
public void noThresholdHigh() throws Exception {
- JMXEndpoint ep = (JMXEndpoint) context.getEndpoint("jmx:platform?objectDomain=FooDomain&objectName=theObjectName&monitorType=gauge&observedAttribute=foo&thresholdLow=100¬ifyHigh=true");
+ JMXEndpoint ep = context.getEndpoint("jmx:platform?objectDomain=FooDomain&objectName=theObjectName&monitorType=gauge&observedAttribute=foo&thresholdLow=100¬ifyHigh=true",
+ JMXEndpoint.class);
try {
ep.createConsumer(null);
fail("expected exception");
@@ -189,7 +190,8 @@ public class JMXEndpointTest {
@Test
public void noThresholdLow() throws Exception {
- JMXEndpoint ep = (JMXEndpoint) context.getEndpoint("jmx:platform?objectDomain=FooDomain&objectName=theObjectName&monitorType=gauge&observedAttribute=foo&thresholdHigh=100¬ifyHigh=true");
+ JMXEndpoint ep = context.getEndpoint("jmx:platform?objectDomain=FooDomain&objectName=theObjectName&monitorType=gauge&observedAttribute=foo&thresholdHigh=100¬ifyHigh=true",
+ JMXEndpoint.class);
try {
ep.createConsumer(null);
fail("expected exception");
@@ -200,7 +202,7 @@ public class JMXEndpointTest {
@Test
public void remoteServerWithMonitor() throws Exception {
- JMXEndpoint ep = (JMXEndpoint) context.getEndpoint("jmx:service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi?objectDomain=FooDomain&key.name=theObjectName&monitorType=gauge");
+ JMXEndpoint ep = context.getEndpoint("jmx:service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi?objectDomain=FooDomain&key.name=theObjectName&monitorType=gauge", JMXEndpoint.class);
try {
ep.createConsumer(null);
fail("expected exception");
Modified: camel/trunk/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/SimpleBeanFixture.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/SimpleBeanFixture.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/SimpleBeanFixture.java (original)
+++ camel/trunk/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/SimpleBeanFixture.java Mon Dec 12 08:57:03 2011
@@ -161,7 +161,7 @@ public class SimpleBeanFixture {
*/
protected void initContext() throws Exception {
mContext.setLazyLoadTypeConverters(true);
- final MockEndpoint mock = (MockEndpoint) mContext.getEndpoint("mock:sink");
+ final MockEndpoint mock = mContext.getEndpoint("mock:sink", MockEndpoint.class);
mock.setExpectedMessageCount(1);
mMockEndpoint = new MockEndpointFixture(mock);
mContext.setRegistry(getRegistry());
Modified: camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/interceptor/JpaTraceEventMessageTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/interceptor/JpaTraceEventMessageTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/interceptor/JpaTraceEventMessageTest.java (original)
+++ camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/interceptor/JpaTraceEventMessageTest.java Mon Dec 12 08:57:03 2011
@@ -77,7 +77,7 @@ public class JpaTraceEventMessageTest ex
}
private void assertEntityInDB() throws Exception {
- jpaTemplate = (JpaTemplate)applicationContext.getBean("jpaTemplate", JpaTemplate.class);
+ jpaTemplate = applicationContext.getBean("jpaTemplate", JpaTemplate.class);
List<?> list = jpaTemplate.find(SELECT_ALL_STRING);
assertEquals(1, list.size());
@@ -90,7 +90,7 @@ public class JpaTraceEventMessageTest ex
}
protected void cleanupRepository() {
- jpaTemplate = (JpaTemplate)applicationContext.getBean("jpaTemplate", JpaTemplate.class);
+ jpaTemplate = applicationContext.getBean("jpaTemplate", JpaTemplate.class);
TransactionTemplate transactionTemplate = new TransactionTemplate();
transactionTemplate.setTransactionManager(new JpaTransactionManager(jpaTemplate.getEntityManagerFactory()));
Modified: camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaBatchConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaBatchConsumerTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaBatchConsumerTest.java (original)
+++ camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaBatchConsumerTest.java Mon Dec 12 08:57:03 2011
@@ -80,7 +80,7 @@ public class JpaBatchConsumerTest extend
}
protected void cleanupRepository() {
- jpaTemplate = (JpaTemplate)applicationContext.getBean("jpaTemplate", JpaTemplate.class);
+ jpaTemplate = applicationContext.getBean("jpaTemplate", JpaTemplate.class);
TransactionTemplate transactionTemplate = new TransactionTemplate();
transactionTemplate.setTransactionManager(new JpaTransactionManager(jpaTemplate.getEntityManagerFactory()));
Modified: camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaFlushOnSendTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaFlushOnSendTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaFlushOnSendTest.java (original)
+++ camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaFlushOnSendTest.java Mon Dec 12 08:57:03 2011
@@ -81,7 +81,7 @@ public class JpaFlushOnSendTest extends
}
protected void cleanupRepository() {
- jpaTemplate = (JpaTemplate)applicationContext.getBean("jpaTemplate", JpaTemplate.class);
+ jpaTemplate = applicationContext.getBean("jpaTemplate", JpaTemplate.class);
TransactionTemplate transactionTemplate = new TransactionTemplate();
transactionTemplate.setTransactionManager(new JpaTransactionManager(jpaTemplate.getEntityManagerFactory()));
Modified: camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaNonTXRollbackTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaNonTXRollbackTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaNonTXRollbackTest.java (original)
+++ camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaNonTXRollbackTest.java Mon Dec 12 08:57:03 2011
@@ -109,7 +109,7 @@ public class JpaNonTXRollbackTest extend
}
protected void cleanupRepository() {
- jpaTemplate = (JpaTemplate)applicationContext.getBean("jpaTemplate", JpaTemplate.class);
+ jpaTemplate = applicationContext.getBean("jpaTemplate", JpaTemplate.class);
TransactionTemplate transactionTemplate = new TransactionTemplate();
transactionTemplate.setTransactionManager(new JpaTransactionManager(jpaTemplate.getEntityManagerFactory()));
Modified: camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaTXRollbackTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaTXRollbackTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaTXRollbackTest.java (original)
+++ camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaTXRollbackTest.java Mon Dec 12 08:57:03 2011
@@ -104,7 +104,7 @@ public class JpaTXRollbackTest extends C
}
protected void cleanupRepository() {
- jpaTemplate = (JpaTemplate)applicationContext.getBean("jpaTemplate", JpaTemplate.class);
+ jpaTemplate = applicationContext.getBean("jpaTemplate", JpaTemplate.class);
TransactionTemplate transactionTemplate = new TransactionTemplate();
transactionTemplate.setTransactionManager(new JpaTransactionManager(jpaTemplate.getEntityManagerFactory()));
Modified: camel/trunk/components/camel-krati/src/test/java/org/apache/camel/component/krati/KratiConsumerSpringTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-krati/src/test/java/org/apache/camel/component/krati/KratiConsumerSpringTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-krati/src/test/java/org/apache/camel/component/krati/KratiConsumerSpringTest.java (original)
+++ camel/trunk/components/camel-krati/src/test/java/org/apache/camel/component/krati/KratiConsumerSpringTest.java Mon Dec 12 08:57:03 2011
@@ -32,7 +32,7 @@ public class KratiConsumerSpringTest ext
template.sendBodyAndHeader("direct:put", "TEST1", KratiConstants.KEY, "1");
template.sendBodyAndHeader("direct:put", "TEST2", KratiConstants.KEY, "2");
template.sendBodyAndHeader("direct:put", "TEST3", KratiConstants.KEY, "3");
- MockEndpoint endpoint = (MockEndpoint) context.getEndpoint("mock:results");
+ MockEndpoint endpoint = context.getEndpoint("mock:results", MockEndpoint.class);
endpoint.expectedMessageCount(3);
endpoint.assertIsSatisfied();
}
Modified: camel/trunk/components/camel-krati/src/test/java/org/apache/camel/component/krati/KratiConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-krati/src/test/java/org/apache/camel/component/krati/KratiConsumerTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-krati/src/test/java/org/apache/camel/component/krati/KratiConsumerTest.java (original)
+++ camel/trunk/components/camel-krati/src/test/java/org/apache/camel/component/krati/KratiConsumerTest.java Mon Dec 12 08:57:03 2011
@@ -31,7 +31,7 @@ public class KratiConsumerTest extends C
template.sendBodyAndHeader("direct:put", "TEST1", KratiConstants.KEY, "1");
template.sendBodyAndHeader("direct:put", "TEST2", KratiConstants.KEY, "2");
template.sendBodyAndHeader("direct:put", "TEST3", KratiConstants.KEY, "3");
- MockEndpoint endpoint = (MockEndpoint) context.getEndpoint("mock:results");
+ MockEndpoint endpoint = context.getEndpoint("mock:results", MockEndpoint.class);
endpoint.expectedMessageCount(3);
endpoint.assertIsSatisfied();
}
Modified: camel/trunk/components/camel-krati/src/test/java/org/apache/camel/component/krati/KratiProducerSpringTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-krati/src/test/java/org/apache/camel/component/krati/KratiProducerSpringTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-krati/src/test/java/org/apache/camel/component/krati/KratiProducerSpringTest.java (original)
+++ camel/trunk/components/camel-krati/src/test/java/org/apache/camel/component/krati/KratiProducerSpringTest.java Mon Dec 12 08:57:03 2011
@@ -32,7 +32,7 @@ public class KratiProducerSpringTest ext
template.sendBodyAndHeader("direct:put", "TEST1", KratiConstants.KEY, "1");
template.sendBodyAndHeader("direct:put", "TEST2", KratiConstants.KEY, "2");
template.sendBodyAndHeader("direct:put", "TEST3", KratiConstants.KEY, "3");
- MockEndpoint endpoint = (MockEndpoint) context.getEndpoint("mock:results");
+ MockEndpoint endpoint = context.getEndpoint("mock:results", MockEndpoint.class);
endpoint.expectedMessageCount(3);
endpoint.assertIsSatisfied();
}
@@ -45,7 +45,7 @@ public class KratiProducerSpringTest ext
template.sendBodyAndHeader("direct:put", "TEST2", KratiConstants.KEY, "2");
template.sendBodyAndHeader("direct:put", "TEST3", KratiConstants.KEY, "3");
- MockEndpoint endpoint = (MockEndpoint) context.getEndpoint("mock:results");
+ MockEndpoint endpoint = context.getEndpoint("mock:results", MockEndpoint.class);
endpoint.expectedMessageCount(3);
endpoint.assertIsSatisfied();
Modified: camel/trunk/components/camel-krati/src/test/java/org/apache/camel/component/krati/KratiProducerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-krati/src/test/java/org/apache/camel/component/krati/KratiProducerTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-krati/src/test/java/org/apache/camel/component/krati/KratiProducerTest.java (original)
+++ camel/trunk/components/camel-krati/src/test/java/org/apache/camel/component/krati/KratiProducerTest.java Mon Dec 12 08:57:03 2011
@@ -34,7 +34,7 @@ public class KratiProducerTest extends C
template.sendBodyAndHeader("direct:put", "TEST1", KratiConstants.KEY, "1");
template.sendBodyAndHeader("direct:put", "TEST2", KratiConstants.KEY, "2");
template.sendBodyAndHeader("direct:put", "TEST3", KratiConstants.KEY, "3");
- MockEndpoint endpoint = (MockEndpoint) context.getEndpoint("mock:results");
+ MockEndpoint endpoint = context.getEndpoint("mock:results", MockEndpoint.class);
endpoint.expectedMessageCount(3);
endpoint.assertIsSatisfied();
}
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/AdditionalMailPropertiesTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/AdditionalMailPropertiesTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/AdditionalMailPropertiesTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/AdditionalMailPropertiesTest.java Mon Dec 12 08:57:03 2011
@@ -34,7 +34,7 @@ public class AdditionalMailPropertiesTes
// clear mailbox
Mailbox.clearAll();
- MailEndpoint endpoint = (MailEndpoint) context.getEndpoint("pop3://localhost?username=james&mail.pop3.forgettopheaders=true");
+ MailEndpoint endpoint = context.getEndpoint("pop3://localhost?username=james&mail.pop3.forgettopheaders=true", MailEndpoint.class);
Properties prop = endpoint.getConfiguration().getAdditionalJavaMailProperties();
assertEquals("true", prop.get("mail.pop3.forgettopheaders"));
}
Modified: camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaNoDefaultCodecTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaNoDefaultCodecTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaNoDefaultCodecTest.java (original)
+++ camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaNoDefaultCodecTest.java Mon Dec 12 08:57:03 2011
@@ -45,8 +45,8 @@ public class MinaNoDefaultCodecTest exte
}
});
- MinaEndpoint endpoint1 = (MinaEndpoint)context.getEndpoint(uri1);
- MinaEndpoint endpoint2 = (MinaEndpoint)context.getEndpoint(uri2);
+ MinaEndpoint endpoint1 = context.getEndpoint(uri1, MinaEndpoint.class);
+ MinaEndpoint endpoint2 = context.getEndpoint(uri2, MinaEndpoint.class);
List<Entry> filters1 = endpoint1.getAcceptorConfig().getFilterChain().getAll();
List<Entry> filters2 = endpoint2.getAcceptorConfig().getFilterChain().getAll();
assertTrue(filters1.size() < filters2.size());
Modified: camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/CronScheduledRoutePolicyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/CronScheduledRoutePolicyTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/CronScheduledRoutePolicyTest.java (original)
+++ camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/CronScheduledRoutePolicyTest.java Mon Dec 12 08:57:03 2011
@@ -42,8 +42,8 @@ public class CronScheduledRoutePolicyTes
@Test
public void testScheduledStartRoutePolicyWithTwoRoutes() throws Exception {
- MockEndpoint success1 = (MockEndpoint) context.getEndpoint("mock:success1");
- MockEndpoint success2 = (MockEndpoint) context.getEndpoint("mock:success2");
+ MockEndpoint success1 = context.getEndpoint("mock:success1", MockEndpoint.class);
+ MockEndpoint success2 = context.getEndpoint("mock:success2", MockEndpoint.class);
success1.expectedMessageCount(1);
success2.expectedMessageCount(1);
@@ -124,7 +124,7 @@ public class CronScheduledRoutePolicyTes
@Test
public void testScheduledStartRoutePolicy() throws Exception {
- MockEndpoint success = (MockEndpoint) context.getEndpoint("mock:success");
+ MockEndpoint success = context.getEndpoint("mock:success", MockEndpoint.class);
success.expectedMessageCount(1);
context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz/myquartz.properties");
@@ -214,7 +214,7 @@ public class CronScheduledRoutePolicyTes
@Test
public void testScheduledResumeRoutePolicy() throws Exception {
- MockEndpoint success = (MockEndpoint) context.getEndpoint("mock:success");
+ MockEndpoint success = context.getEndpoint("mock:success", MockEndpoint.class);
success.expectedMessageCount(1);
context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz/myquartz.properties");
Modified: camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/MultiplePoliciesOnRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/MultiplePoliciesOnRouteTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/MultiplePoliciesOnRouteTest.java (original)
+++ camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/MultiplePoliciesOnRouteTest.java Mon Dec 12 08:57:03 2011
@@ -68,7 +68,7 @@ public class MultiplePoliciesOnRouteTest
@Test
public void testMultiplePoliciesOnRoute() throws Exception {
- MockEndpoint success = (MockEndpoint) context.getEndpoint("mock:success");
+ MockEndpoint success = context.getEndpoint("mock:success", MockEndpoint.class);
success.expectedMinimumMessageCount(size - 10);
context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz/myquartz.properties");
Modified: camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledCombinedRoutePolicyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledCombinedRoutePolicyTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledCombinedRoutePolicyTest.java (original)
+++ camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledCombinedRoutePolicyTest.java Mon Dec 12 08:57:03 2011
@@ -39,7 +39,7 @@ public class SimpleScheduledCombinedRout
@Test
public void testScheduledStartAndStopRoutePolicy() throws Exception {
- MockEndpoint success = (MockEndpoint) context.getEndpoint("mock:success");
+ MockEndpoint success = context.getEndpoint("mock:success", MockEndpoint.class);
success.expectedMessageCount(1);
context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz/myquartz.properties");
Modified: camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicyTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicyTest.java (original)
+++ camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicyTest.java Mon Dec 12 08:57:03 2011
@@ -43,7 +43,7 @@ public class SimpleScheduledRoutePolicyT
@Test
public void testScheduledStartRoutePolicy() throws Exception {
- MockEndpoint success = (MockEndpoint) context.getEndpoint("mock:success");
+ MockEndpoint success = context.getEndpoint("mock:success", MockEndpoint.class);
success.expectedMessageCount(1);
context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz/myquartz.properties");
@@ -139,7 +139,7 @@ public class SimpleScheduledRoutePolicyT
@Test
public void testScheduledResumeRoutePolicy() throws Exception {
- MockEndpoint success = (MockEndpoint) context.getEndpoint("mock:success");
+ MockEndpoint success = context.getEndpoint("mock:success", MockEndpoint.class);
success.expectedMessageCount(1);
context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz/myquartz.properties");
Modified: camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringScheduledRoutePolicyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringScheduledRoutePolicyTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringScheduledRoutePolicyTest.java (original)
+++ camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringScheduledRoutePolicyTest.java Mon Dec 12 08:57:03 2011
@@ -44,7 +44,7 @@ public abstract class SpringScheduledRou
public void startTest() throws Exception {
CamelContext context = startRouteWithPolicy("startPolicy");
- MockEndpoint mock = (MockEndpoint) context.getEndpoint("mock:success");
+ MockEndpoint mock = context.getEndpoint("mock:success", MockEndpoint.class);
mock.expectedMinimumMessageCount(1);
context.stopRoute("testRoute", 0, TimeUnit.MILLISECONDS);
@@ -94,7 +94,7 @@ public abstract class SpringScheduledRou
public void resumeTest() throws Exception {
CamelContext context = startRouteWithPolicy("resumePolicy");
- MockEndpoint mock = (MockEndpoint) context.getEndpoint("mock:success");
+ MockEndpoint mock = context.getEndpoint("mock:success", MockEndpoint.class);
mock.expectedMinimumMessageCount(1);
ServiceHelper.suspendService(context.getRoute("testRoute").getConsumer());
@@ -110,7 +110,7 @@ public abstract class SpringScheduledRou
private CamelContext startRouteWithPolicy(String policyBeanName) throws Exception {
CamelContext context = new DefaultCamelContext();
ArrayList<RouteDefinition> routes = (ArrayList<RouteDefinition>)applicationContext.getBean("testRouteContext");
- RoutePolicy policy = (RoutePolicy)applicationContext.getBean(policyBeanName);
+ RoutePolicy policy = applicationContext.getBean(policyBeanName, RoutePolicy.class);
assertTrue(getTestType() == TestType.SIMPLE
? policy instanceof SimpleScheduledRoutePolicy
: policy instanceof CronScheduledRoutePolicy);
Modified: camel/trunk/components/camel-solr/src/test/java/org/apache/camel/component/solr/InitSolrEndpointTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-solr/src/test/java/org/apache/camel/component/solr/InitSolrEndpointTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-solr/src/test/java/org/apache/camel/component/solr/InitSolrEndpointTest.java (original)
+++ camel/trunk/components/camel-solr/src/test/java/org/apache/camel/component/solr/InitSolrEndpointTest.java Mon Dec 12 08:57:03 2011
@@ -26,7 +26,7 @@ public class InitSolrEndpointTest extend
@Test
public void endpointCreatedCorrectlyWithAllOptions() throws Exception {
- SolrEndpoint solrEndpoint = (SolrEndpoint) context.getEndpoint(solrUrl + getFullOptions());
+ SolrEndpoint solrEndpoint = context.getEndpoint(solrUrl + getFullOptions(), SolrEndpoint.class);
assertNotNull(solrEndpoint);
}
Modified: camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java (original)
+++ camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java Mon Dec 12 08:57:03 2011
@@ -112,7 +112,7 @@ public class SpringIntegrationConsumer
Object returnAddress = siInMessage.getHeaders().getReplyChannel();
if (returnAddress != null) {
if (returnAddress instanceof String) {
- reply = (MessageChannel) context.getApplicationContext().getBean((String)returnAddress);
+ reply = context.getApplicationContext().getBean((String)returnAddress, MessageChannel.class);
} else if (returnAddress instanceof MessageChannel) {
reply = (MessageChannel) returnAddress;
}
Modified: camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationOneWayConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationOneWayConsumerTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationOneWayConsumerTest.java (original)
+++ camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationOneWayConsumerTest.java Mon Dec 12 08:57:03 2011
@@ -31,7 +31,7 @@ public class SpringIntegrationOneWayCons
MockEndpoint resultEndpoint = resolveMandatoryEndpoint("mock:result", MockEndpoint.class);
resultEndpoint.expectedBodiesReceived(MESSAGE_BODY);
- MessageChannel outputChannel = (MessageChannel) applicationContext.getBean("outputChannel");
+ MessageChannel outputChannel = applicationContext.getBean("outputChannel", MessageChannel.class);
outputChannel.send(new GenericMessage<Object>(MESSAGE_BODY));
resultEndpoint.assertIsSatisfied();
Modified: camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationProducerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationProducerTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationProducerTest.java (original)
+++ camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationProducerTest.java Mon Dec 12 08:57:03 2011
@@ -36,7 +36,7 @@ public class SpringIntegrationProducerTe
@Test
public void testSendingOneWayMessage() throws Exception {
template.sendBody("direct:onewayMessage", "Greet");
- HelloWorldService service = (HelloWorldService)applicationContext.getBean("helloService");
+ HelloWorldService service = applicationContext.getBean("helloService", HelloWorldService.class);
assertEquals("We should call the service", service.getGreetName(), "Greet");
}
Modified: camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationTwoWayConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationTwoWayConsumerTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationTwoWayConsumerTest.java (original)
+++ camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationTwoWayConsumerTest.java Mon Dec 12 08:57:03 2011
@@ -34,13 +34,13 @@ public class SpringIntegrationTwoWayCons
@Test
public void testSendingTwoWayMessage() throws Exception {
- MessageChannel requestChannel = (MessageChannel) applicationContext.getBean("requestChannel");
+ MessageChannel requestChannel = applicationContext.getBean("requestChannel", MessageChannel.class);
Map<String, Object> maps = new HashMap<String, Object>();
maps.put(MessageHeaders.REPLY_CHANNEL, "responseChannel");
Message<String> message = new GenericMessage<String>(MESSAGE_BODY, maps);
- DirectChannel responseChannel = (DirectChannel) applicationContext.getBean("responseChannel");
+ DirectChannel responseChannel = applicationContext.getBean("responseChannel", DirectChannel.class);
responseChannel.subscribe(new MessageHandler() {
public void handleMessage(Message<?> message) {
String result = (String) message.getPayload();
Modified: camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapterTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapterTest.java (original)
+++ camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapterTest.java Mon Dec 12 08:57:03 2011
@@ -27,7 +27,7 @@ import org.springframework.integration.c
public class CamelSourceAdapterTest extends CamelSpringTestSupport {
@Test
public void testSendingOneWayMessage() throws Exception {
- DirectChannel channelA = (DirectChannel) applicationContext.getBean("channelA");
+ DirectChannel channelA = applicationContext.getBean("channelA", DirectChannel.class);
channelA.subscribe(new MessageHandler() {
public void handleMessage(Message<?> message) {
assertEquals("We should get the message from channelA", message.getPayload(), "Willem");
Modified: camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapterTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapterTest.java (original)
+++ camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapterTest.java Mon Dec 12 08:57:03 2011
@@ -37,7 +37,7 @@ public class CamelTargetAdapterTest exte
public void testSendingOneWayMessage() throws Exception {
MockEndpoint resultEndpoint = resolveMandatoryEndpoint("mock:result", MockEndpoint.class);
resultEndpoint.expectedBodiesReceived(MESSAGE_BODY);
- MessageChannel outputChannel = (MessageChannel) applicationContext.getBean("channelA");
+ MessageChannel outputChannel = applicationContext.getBean("channelA", MessageChannel.class);
outputChannel.send(new GenericMessage<Object>(MESSAGE_BODY));
resultEndpoint.assertIsSatisfied();
}
@@ -45,7 +45,7 @@ public class CamelTargetAdapterTest exte
@Test
public void testSendingTwoWayMessage() throws Exception {
- MessageChannel requestChannel = (MessageChannel) applicationContext.getBean("channelB");
+ MessageChannel requestChannel = applicationContext.getBean("channelB", MessageChannel.class);
Message message = new GenericMessage<Object>(MESSAGE_BODY);
//Need to subscribe the responseChannel first
DirectChannel responseChannel = (DirectChannel) applicationContext.getBean("channelC");
@@ -61,8 +61,8 @@ public class CamelTargetAdapterTest exte
@Test
public void testSendingTwoWayMessageWithMessageAddress() throws Exception {
- MessageChannel requestChannel = (MessageChannel) applicationContext.getBean("channelD");
- DirectChannel responseChannel = (DirectChannel) applicationContext.getBean("channelC");
+ MessageChannel requestChannel = applicationContext.getBean("channelD", MessageChannel.class);
+ DirectChannel responseChannel = applicationContext.getBean("channelC", DirectChannel.class);
Map<String, Object> headers = new HashMap<String, Object>();
headers.put(MessageHeaders.REPLY_CHANNEL, responseChannel);
GenericMessage<String> message = new GenericMessage<String>(MESSAGE_BODY, headers);
Modified: camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/ConfigurationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/ConfigurationTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/ConfigurationTest.java (original)
+++ camel/trunk/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/ConfigurationTest.java Mon Dec 12 08:57:03 2011
@@ -28,11 +28,11 @@ public class ConfigurationTest extends A
@Test
public void testCamelSourceEndpoint() throws Exception {
context = new ClassPathXmlApplicationContext(new String[]{"/org/apache/camel/component/spring/integration/adapter/CamelSource.xml"});
- CamelSourceAdapter camelSourceA = (CamelSourceAdapter) context.getBean("camelSourceA");
+ CamelSourceAdapter camelSourceA = context.getBean("camelSourceA", CamelSourceAdapter.class);
assertNotNull(camelSourceA);
assertEquals("Get the wrong request channel name", camelSourceA.getChannel().toString(), "channelA");
assertEquals("ExpectReply should be false ", camelSourceA.isExpectReply(), false);
- CamelSourceAdapter camelSourceB = (CamelSourceAdapter) context.getBean("camelSourceB");
+ CamelSourceAdapter camelSourceB = context.getBean("camelSourceB", CamelSourceAdapter.class);
assertNotNull(camelSourceB);
assertEquals("Get the wrong request channel name", camelSourceB.getChannel().toString(), "channelB");
assertEquals("ExpectReply should be true ", camelSourceB.isExpectReply(), true);
@@ -43,10 +43,10 @@ public class ConfigurationTest extends A
@Test
public void testCamelTragetEndpoint() throws Exception {
context = new ClassPathXmlApplicationContext(new String[]{"/org/apache/camel/component/spring/integration/adapter/CamelTarget.xml"});
- CamelTargetAdapter camelTargetA = (CamelTargetAdapter)context.getBean("camelTargetA");
+ CamelTargetAdapter camelTargetA = context.getBean("camelTargetA", CamelTargetAdapter.class);
assertNotNull(camelTargetA);
assertEquals("Subscript the wrong CamelEndpointUri", camelTargetA.getCamelEndpointUri(), "direct:EndpointA");
- CamelTargetAdapter camelTargetB = (CamelTargetAdapter)context.getBean("camelTargetB");
+ CamelTargetAdapter camelTargetB = context.getBean("camelTargetB", CamelTargetAdapter.class);
assertNotNull(camelTargetB);
assertEquals("Subscript the wrong reply channel name", camelTargetB.getReplyChannel().toString(), "channelC");
context.destroy();
Modified: camel/trunk/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/MainTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/MainTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/MainTest.java (original)
+++ camel/trunk/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/MainTest.java Mon Dec 12 08:57:03 2011
@@ -53,7 +53,7 @@ public class MainTest extends Assert {
private void runTests(CamelContext context) throws Exception {
- MockEndpoint resultEndpoint = (MockEndpoint) context.getEndpoint("mock:result");
+ MockEndpoint resultEndpoint = context.getEndpoint("mock:result", MockEndpoint.class);
ProducerTemplate template = context.createProducerTemplate();
String expectedBody = "<matched/>";
Modified: camel/trunk/components/camel-spring-security/src/test/java/org/apache/camel/component/spring/security/config/SpringSecurityAuthorizationPolicyConfigTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-security/src/test/java/org/apache/camel/component/spring/security/config/SpringSecurityAuthorizationPolicyConfigTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-security/src/test/java/org/apache/camel/component/spring/security/config/SpringSecurityAuthorizationPolicyConfigTest.java (original)
+++ camel/trunk/components/camel-spring-security/src/test/java/org/apache/camel/component/spring/security/config/SpringSecurityAuthorizationPolicyConfigTest.java Mon Dec 12 08:57:03 2011
@@ -46,13 +46,13 @@ public class SpringSecurityAuthorization
@Test
public void testAuthorizationPolicy() {
- SpringSecurityAuthorizationPolicy adminPolicy = (SpringSecurityAuthorizationPolicy) context.getBean("admin");
+ SpringSecurityAuthorizationPolicy adminPolicy = context.getBean("admin", SpringSecurityAuthorizationPolicy.class);
assertNotNull("We should get admin policy", adminPolicy);
assertNotNull("The accessDecisionManager should not be null", adminPolicy.getAccessDecisionManager());
assertNotNull("The authenticationManager should not be null", adminPolicy.getAuthenticationManager());
assertNotNull("The springSecurityAccessPolicy should not be null", adminPolicy.getSpringSecurityAccessPolicy());
- SpringSecurityAuthorizationPolicy userPolicy = (SpringSecurityAuthorizationPolicy) context.getBean("user");
+ SpringSecurityAuthorizationPolicy userPolicy = context.getBean("user", SpringSecurityAuthorizationPolicy.class);
assertNotNull("We should get user policy", userPolicy);
assertNotNull("The accessDecisionManager should not be null", userPolicy.getAccessDecisionManager());
assertNotNull("The authenticationManager should not be null", userPolicy.getAuthenticationManager());
Modified: camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingByBeanNameRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingByBeanNameRouteTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingByBeanNameRouteTest.java (original)
+++ camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingByBeanNameRouteTest.java Mon Dec 12 08:57:03 2011
@@ -44,7 +44,7 @@ public class ConsumerEndpointMappingByBe
@Before
public void setUp() throws Exception {
super.setUp();
- webServiceTemplate = (WebServiceTemplate) applicationContext.getBean("webServiceTemplate");
+ webServiceTemplate = applicationContext.getBean("webServiceTemplate", WebServiceTemplate.class);
}
public String toUnixLineEndings(String inSt) {
Modified: camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingResponseHandlingRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingResponseHandlingRouteTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingResponseHandlingRouteTest.java (original)
+++ camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingResponseHandlingRouteTest.java Mon Dec 12 08:57:03 2011
@@ -47,7 +47,7 @@ public class ConsumerEndpointMappingResp
@Before
public void setUp() throws Exception {
super.setUp();
- webServiceTemplate = (WebServiceTemplate) applicationContext.getBean("webServiceTemplate");
+ webServiceTemplate = applicationContext.getBean("webServiceTemplate", WebServiceTemplate.class);
}
public String toUnixLineEndings(String inSt) {
Modified: camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingRouteTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingRouteTest.java (original)
+++ camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingRouteTest.java Mon Dec 12 08:57:03 2011
@@ -63,7 +63,7 @@ public class ConsumerEndpointMappingRout
@Before
public void setUp() throws Exception {
super.setUp();
- webServiceTemplate = (WebServiceTemplate) applicationContext.getBean("webServiceTemplate");
+ webServiceTemplate = applicationContext.getBean("webServiceTemplate", WebServiceTemplate.class);
}
@Test
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelBeanPostProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelBeanPostProcessor.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelBeanPostProcessor.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelBeanPostProcessor.java Mon Dec 12 08:57:03 2011
@@ -244,7 +244,7 @@ public class CamelBeanPostProcessor impl
protected CamelContext getOrLookupCamelContext() {
if (camelContext == null && applicationContext.containsBean(camelId)) {
- camelContext = (CamelContext) applicationContext.getBean(camelId);
+ camelContext = applicationContext.getBean(camelId, CamelContext.class);
}
return camelContext;
}
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java Mon Dec 12 08:57:03 2011
@@ -162,7 +162,7 @@ public class CamelContextFactoryBean ext
@Override
- public Class getObjectType() {
+ public Class<SpringCamelContext> getObjectType() {
return SpringCamelContext.class;
}
@@ -170,14 +170,14 @@ public class CamelContextFactoryBean ext
S bean = null;
String[] names = getApplicationContext().getBeanNamesForType(clazz, true, true);
if (names.length == 1) {
- bean = (S) getApplicationContext().getBean(names[0], clazz);
+ bean = getApplicationContext().getBean(names[0], clazz);
}
if (bean == null) {
ApplicationContext parentContext = getApplicationContext().getParent();
if (parentContext != null) {
names = parentContext.getBeanNamesForType(clazz, true, true);
if (names.length == 1) {
- bean = (S) parentContext.getBean(names[0], clazz);
+ bean = parentContext.getBean(names[0], clazz);
}
}
}
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/Main.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/Main.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/Main.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/Main.java Mon Dec 12 08:57:03 2011
@@ -156,7 +156,7 @@ public class Main extends MainSupport {
protected ProducerTemplate findOrCreateCamelTemplate() {
String[] names = getApplicationContext().getBeanNamesForType(ProducerTemplate.class);
if (names != null && names.length > 0) {
- return (ProducerTemplate) getApplicationContext().getBean(names[0], ProducerTemplate.class);
+ return getApplicationContext().getBean(names[0], ProducerTemplate.class);
}
if (getCamelContexts().isEmpty()) {
throw new IllegalArgumentException("No CamelContexts are available so cannot create a ProducerTemplate!");
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java Mon Dec 12 08:57:03 2011
@@ -87,7 +87,7 @@ public class SpringCamelContext extends
// lets try and look up a configured camel context in the context
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);
}
}
SpringCamelContext answer = new SpringCamelContext();
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/SpringRouteBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/SpringRouteBuilder.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/SpringRouteBuilder.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/SpringRouteBuilder.java Mon Dec 12 08:57:03 2011
@@ -45,7 +45,7 @@ public abstract class SpringRouteBuilder
*/
public <T> T lookup(String beanName, Class<T> type) {
ApplicationContext context = getApplicationContext();
- return (T)context.getBean(beanName, type);
+ return context.getBean(beanName, type);
}
/**
@@ -56,7 +56,6 @@ public abstract class SpringRouteBuilder
* @param type the type of the bean
* @return the bean
*/
- @SuppressWarnings("unchecked")
public <T> T lookup(Class<T> type) {
ApplicationContext context = getApplicationContext();
String[] names = context.getBeanNamesForType(type, true, true);
@@ -64,7 +63,7 @@ public abstract class SpringRouteBuilder
int count = names.length;
if (count == 1) {
// lets instantiate the single bean
- return (T)context.getBean(names[0]);
+ return context.getBean(names[0], type);
} else if (count > 1) {
throw new IllegalArgumentException("Too many beans in the application context of type: " + type + ". Found: " + count);
}
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/util/CamelContextResolverHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/util/CamelContextResolverHelper.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/util/CamelContextResolverHelper.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/util/CamelContextResolverHelper.java Mon Dec 12 08:57:03 2011
@@ -30,7 +30,7 @@ public final class CamelContextResolverH
public static CamelContext getCamelContextWithId(ApplicationContext context, String contextId) {
try {
- return (CamelContext) context.getBean(contextId);
+ return context.getBean(contextId, CamelContext.class);
} catch (Exception e) {
throw new IllegalArgumentException("Cannot find the CamelContext with id " + contextId, e);
}
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/ApplicationContextTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/ApplicationContextTestSupport.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/ApplicationContextTestSupport.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/ApplicationContextTestSupport.java Mon Dec 12 08:57:03 2011
@@ -50,13 +50,6 @@ public abstract class ApplicationContext
* 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);
}
}
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/CustomProcessorWithNamespacesTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/CustomProcessorWithNamespacesTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/CustomProcessorWithNamespacesTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/CustomProcessorWithNamespacesTest.java Mon Dec 12 08:57:03 2011
@@ -38,8 +38,7 @@ public class CustomProcessorWithNamespac
public void testXMLRouteLoading() throws Exception {
applicationContext = createApplicationContext();
- // 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();
assertValidContext(context);
// now lets send a message
@@ -54,7 +53,7 @@ public class CustomProcessorWithNamespac
});
template.stop();
- MyProcessor myProcessor = (MyProcessor) applicationContext.getBean("myProcessor");
+ MyProcessor myProcessor = applicationContext.getBean("myProcessor", MyProcessor.class);
List<Exchange> list = myProcessor.getExchanges();
assertEquals("Should have received a single exchange: " + list, 1, list.size());
}
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultStreamCachingTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultStreamCachingTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultStreamCachingTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultStreamCachingTest.java Mon Dec 12 08:57:03 2011
@@ -17,7 +17,7 @@
package org.apache.camel.spring;
import junit.framework.TestCase;
-import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.CamelContext;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -26,7 +26,7 @@ public class DefaultStreamCachingTest ex
public void testStreamCaching() throws Exception {
ApplicationContext appContext = new ClassPathXmlApplicationContext(new String[] {"org/apache/camel/spring/streamCaching.xml"});
- DefaultCamelContext camelContext = (DefaultCamelContext) appContext.getBean("camelContext");
+ CamelContext camelContext = appContext.getBean("camelContext", CamelContext.class);
assertFalse("StreamCaching should not be enabled", camelContext.isStreamCaching());
}
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/EndpointReferenceTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/EndpointReferenceTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/EndpointReferenceTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/EndpointReferenceTest.java Mon Dec 12 08:57:03 2011
@@ -57,7 +57,7 @@ public class EndpointReferenceTest exten
}
protected SpringCamelContext createCamelContext() {
- return (SpringCamelContext) applicationContext.getBean("camel");
+ return applicationContext.getBean("camel", SpringCamelContext.class);
}
public void testEndpointConfigurationAfterEnsuringThatTheStatementRouteBuilderWasCreated() throws Exception {
@@ -70,7 +70,7 @@ public class EndpointReferenceTest exten
}
public void testReferenceEndpointFromOtherCamelContext() throws Exception {
- CamelContext context = (CamelContext)applicationContext.getBean("camel2");
+ CamelContext context = applicationContext.getBean("camel2", CamelContext.class);
RouteContext routeContext = new DefaultRouteContext(context);
try {
routeContext.resolveEndpoint(null, "endpoint1");
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/RoutingUsingCamelContextFactoryTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/RoutingUsingCamelContextFactoryTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/RoutingUsingCamelContextFactoryTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/RoutingUsingCamelContextFactoryTest.java Mon Dec 12 08:57:03 2011
@@ -38,7 +38,7 @@ public class RoutingUsingCamelContextFac
public void testXMLRouteLoading() throws Exception {
applicationContext = createApplicationContext();
- SpringCamelContext context = (SpringCamelContext) applicationContext.getBean("camel-A");
+ SpringCamelContext context = applicationContext.getBean("camel-A", SpringCamelContext.class);
assertValidContext(context);
MockEndpoint resultEndpoint = (MockEndpoint) resolveMandatoryEndpoint(context, "mock:result");
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/SpringTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/SpringTestSupport.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/SpringTestSupport.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/SpringTestSupport.java Mon Dec 12 08:57:03 2011
@@ -102,7 +102,7 @@ public abstract class SpringTestSupport
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,9 @@ public abstract class SpringTestSupport
* it is not present or the correct type
*/
public <T> T getMandatoryBean(Class<T> type, String name) {
- Object value = applicationContext.getBean(name);
+ T value = applicationContext.getBean(name, type);
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 value;
}
@Override
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/AnotherCamelProxyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/AnotherCamelProxyTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/AnotherCamelProxyTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/AnotherCamelProxyTest.java Mon Dec 12 08:57:03 2011
@@ -29,7 +29,7 @@ public class AnotherCamelProxyTest exten
// START SNIPPET: e1
ApplicationContext ac = new ClassPathXmlApplicationContext("org/apache/camel/spring/config/AnotherCamelProxyTest.xml");
- MyProxySender sender = (MyProxySender) ac.getBean("myProxySender");
+ MyProxySender sender = ac.getBean("myProxySender", MyProxySender.class);
String reply = sender.hello("Camel");
assertEquals("Bye Camel", reply);
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelContextAutoStartupTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelContextAutoStartupTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelContextAutoStartupTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelContextAutoStartupTest.java Mon Dec 12 08:57:03 2011
@@ -33,8 +33,7 @@ public class CamelContextAutoStartupTest
public void testAutoStartupFalse() throws Exception {
ac = new ClassPathXmlApplicationContext("org/apache/camel/spring/config/CamelContextAutoStartupTestFalse.xml");
- // must type cast to work with Spring 2.5.x
- SpringCamelContext camel = (SpringCamelContext) ac.getBeansOfType(SpringCamelContext.class).values().iterator().next();
+ SpringCamelContext camel = ac.getBeansOfType(SpringCamelContext.class).values().iterator().next();
assertNotNull(camel.getName());
assertEquals(true, camel.isStarted());
assertEquals(Boolean.FALSE, camel.isAutoStartup());
@@ -64,8 +63,7 @@ public class CamelContextAutoStartupTest
public void testAutoStartupTrue() throws Exception {
ac = new ClassPathXmlApplicationContext("org/apache/camel/spring/config/CamelContextAutoStartupTestTrue.xml");
- // must type cast to work with Spring 2.5.x
- SpringCamelContext camel = (SpringCamelContext) ac.getBeansOfType(SpringCamelContext.class).values().iterator().next();
+ SpringCamelContext camel = ac.getBeansOfType(SpringCamelContext.class).values().iterator().next();
assertNotNull(camel.getName());
assertEquals(true, camel.isStarted());
assertEquals(Boolean.TRUE, camel.isAutoStartup());
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelContextFactoryBeanTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelContextFactoryBeanTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelContextFactoryBeanTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelContextFactoryBeanTest.java Mon Dec 12 08:57:03 2011
@@ -60,7 +60,7 @@ public class CamelContextFactoryBeanTest
public void testClassPathRouteLoadingUsingNamespaces() throws Exception {
ApplicationContext applicationContext = new ClassPathXmlApplicationContext("org/apache/camel/spring/camelContextFactoryBean.xml");
- CamelContext context = (CamelContext) applicationContext.getBean("camel3");
+ CamelContext context = applicationContext.getBean("camel3", CamelContext.class);
assertValidContext(context);
}
@@ -72,14 +72,14 @@ public class CamelContextFactoryBeanTest
// lets refresh to inject the applicationContext into beans
applicationContext.refresh();
- CamelContext context = (CamelContext) applicationContext.getBean("camel3");
+ CamelContext context = applicationContext.getBean("camel3", CamelContext.class);
assertValidContext(context);
}
public void testXMLRouteLoading() throws Exception {
ApplicationContext applicationContext = new ClassPathXmlApplicationContext("org/apache/camel/spring/camelContextFactoryBean.xml");
- CamelContext context = (CamelContext) applicationContext.getBean("camel2");
+ CamelContext context = applicationContext.getBean("camel2", CamelContext.class);
assertNotNull("No context found!", context);
List<Route> routes = context.getRoutes();
@@ -101,7 +101,7 @@ public class CamelContextFactoryBeanTest
public void testRouteBuilderRef() throws Exception {
ApplicationContext applicationContext = new ClassPathXmlApplicationContext("org/apache/camel/spring/camelContextRouteBuilderRef.xml");
- CamelContext context = (CamelContext) applicationContext.getBean("camel5");
+ CamelContext context = applicationContext.getBean("camel5", CamelContext.class);
assertNotNull("No context found!", context);
assertValidContext(context);
@@ -110,12 +110,12 @@ public class CamelContextFactoryBeanTest
public void testAutoStartup() throws Exception {
ApplicationContext applicationContext = new ClassPathXmlApplicationContext("org/apache/camel/spring/camelContextFactoryBean.xml");
- SpringCamelContext context = (SpringCamelContext) applicationContext.getBean("camel4");
+ SpringCamelContext context = applicationContext.getBean("camel4", SpringCamelContext.class);
assertFalse(context.isAutoStartup());
// there is 1 route but its not started
assertEquals(1, context.getRoutes().size());
- context = (SpringCamelContext) applicationContext.getBean("camel3");
+ context = applicationContext.getBean("camel3", SpringCamelContext.class);
assertTrue(context.isAutoStartup());
// there is 1 route but and its started
assertEquals(1, context.getRoutes().size());
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelProxyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelProxyTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelProxyTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelProxyTest.java Mon Dec 12 08:57:03 2011
@@ -32,15 +32,14 @@ public class CamelProxyTest extends Test
public void testCamelProxy() throws Exception {
ApplicationContext ac = new ClassPathXmlApplicationContext("org/apache/camel/spring/config/CamelProxyTest.xml");
- MyProxySender sender = (MyProxySender) ac.getBean("myProxySender");
+ MyProxySender sender = ac.getBean("myProxySender", MyProxySender.class);
String reply = sender.hello("World");
assertEquals("Hello World", reply);
// test sending inOnly message
- MyProxySender anotherSender = (MyProxySender) ac.getBean("myAnotherProxySender");
- // must type cast to work with Spring 2.5.x
- SpringCamelContext context = (SpringCamelContext) ac.getBeansOfType(SpringCamelContext.class).values().iterator().next();
+ MyProxySender anotherSender = ac.getBean("myAnotherProxySender", MyProxySender.class);
+ SpringCamelContext context = ac.getBeansOfType(SpringCamelContext.class).values().iterator().next();
MockEndpoint result = TestSupport.resolveMandatoryEndpoint(context, "mock:result", MockEndpoint.class);
result.expectedBodiesReceived("Hello my friends!");
@@ -49,7 +48,7 @@ public class CamelProxyTest extends Test
result.reset();
// test sending inOnly message with other sender
- MyProxySender myProxySenderWithCamelContextId = (MyProxySender) ac.getBean("myProxySenderWithCamelContextId");
+ MyProxySender myProxySenderWithCamelContextId = ac.getBean("myProxySenderWithCamelContextId", MyProxySender.class);
result.expectedBodiesReceived("Hello my friends again!");
myProxySenderWithCamelContextId.greeting("Hello my friends again!");
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelProxyUsingRefTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelProxyUsingRefTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelProxyUsingRefTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelProxyUsingRefTest.java Mon Dec 12 08:57:03 2011
@@ -28,7 +28,7 @@ public class CamelProxyUsingRefTest exte
public void testCamelProxyUsingRef() throws Exception {
ApplicationContext ac = new ClassPathXmlApplicationContext("org/apache/camel/spring/config/CamelProxyUsingRefTest.xml");
- MyProxySender sender = (MyProxySender) ac.getBean("myProxySender");
+ MyProxySender sender = ac.getBean("myProxySender", MyProxySender.class);
String reply = sender.hello("World");
assertEquals("Hello World", reply);
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerTest.java Mon Dec 12 08:57:03 2011
@@ -35,8 +35,7 @@ public class ErrorHandlerTest extends Sp
}
public void testEndpointConfiguration() throws Exception {
- // 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();
List<Route> list = context.getRoutes();
assertEquals("Number routes created" + list, 2, list.size());
for (Route route : list) {
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteAutoStartupPropertiesTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteAutoStartupPropertiesTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteAutoStartupPropertiesTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteAutoStartupPropertiesTest.java Mon Dec 12 08:57:03 2011
@@ -33,8 +33,7 @@ public class RouteAutoStartupPropertiesT
public void testAutoStartupFalse() throws Exception {
ac = new ClassPathXmlApplicationContext("org/apache/camel/spring/config/RouteAutoStartupFalseTest.xml");
- // must type cast to work with Spring 2.5.x
- SpringCamelContext camel = (SpringCamelContext) ac.getBeansOfType(SpringCamelContext.class).values().iterator().next();
+ SpringCamelContext camel = ac.getBeansOfType(SpringCamelContext.class).values().iterator().next();
assertEquals(false, camel.getRouteStatus("foo").isStarted());
@@ -57,8 +56,7 @@ public class RouteAutoStartupPropertiesT
public void testAutoStartupTrue() throws Exception {
ac = new ClassPathXmlApplicationContext("org/apache/camel/spring/config/RouteAutoStartupTrueTest.xml");
- // must type cast to work with Spring 2.5.x
- SpringCamelContext camel = (SpringCamelContext) ac.getBeansOfType(SpringCamelContext.class).values().iterator().next();
+ SpringCamelContext camel = ac.getBeansOfType(SpringCamelContext.class).values().iterator().next();
assertEquals(true, camel.getRouteStatus("bar").isStarted());
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteBuilderRefTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteBuilderRefTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteBuilderRefTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteBuilderRefTest.java Mon Dec 12 08:57:03 2011
@@ -29,7 +29,7 @@ public class RouteBuilderRefTest extends
ApplicationContext applicationContext =
new ClassPathXmlApplicationContext("org/apache/camel/spring/config/routeBuilderRef.xml");
- CamelContext context = (CamelContext) applicationContext.getBean("camel5");
+ CamelContext context = applicationContext.getBean("camel5", CamelContext.class);
assertValidContext(context);
}
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteRefMultipleCamelContextRefsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteRefMultipleCamelContextRefsTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteRefMultipleCamelContextRefsTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/RouteRefMultipleCamelContextRefsTest.java Mon Dec 12 08:57:03 2011
@@ -36,8 +36,8 @@ public class RouteRefMultipleCamelContex
AbstractXmlApplicationContext ac = createApplicationContext();
ac.start();
- CamelContext camel1 = (CamelContext) ac.getBean("myCamel-1", CamelContext.class);
- CamelContext camel2 = (CamelContext) ac.getBean("myCamel-2", CamelContext.class);
+ CamelContext camel1 = ac.getBean("myCamel-1", CamelContext.class);
+ CamelContext camel2 = ac.getBean("myCamel-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/config/SpringCamelContextCustomDefaultThreadPoolProfileTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextCustomDefaultThreadPoolProfileTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextCustomDefaultThreadPoolProfileTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/SpringCamelContextCustomDefaultThreadPoolProfileTest.java Mon Dec 12 08:57:03 2011
@@ -30,8 +30,7 @@ public class SpringCamelContextCustomDef
}
public void testDefaultThreadPoolProfile() throws Exception {
- // 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();
ThreadPoolProfile profile = context.getExecutorServiceManager().getDefaultThreadPoolProfile();
assertEquals(5, profile.getPoolSize().intValue());
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/scan/SpringComponentScanTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/scan/SpringComponentScanTest.java?rev=1213169&r1=1213168&r2=1213169&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/scan/SpringComponentScanTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/scan/SpringComponentScanTest.java Mon Dec 12 08:57:03 2011
@@ -18,7 +18,6 @@ package org.apache.camel.spring.config.s
import java.util.concurrent.TimeUnit;
-import org.apache.camel.CamelContext;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.model.ModelCamelContext;
@@ -34,7 +33,7 @@ public class SpringComponentScanTest ext
context.stop();
}
ApplicationContext c = new ClassPathXmlApplicationContext("org/apache/camel/spring/config/scan/componentScan.xml");
- context = (ModelCamelContext)c.getBean("camelScan");
+ context = c.getBean("camelScan", ModelCamelContext.class);
template = context.createProducerTemplate();
template.start();
}