diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractMessageRouter.java b/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractMessageRouter.java index 731ac17cbb..93b7075861 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractMessageRouter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractMessageRouter.java @@ -25,7 +25,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.springframework.beans.factory.BeanFactory; import org.springframework.core.convert.ConversionService; -import org.springframework.core.convert.support.ConversionServiceFactory; +import org.springframework.core.convert.support.DefaultConversionService; import org.springframework.integration.Message; import org.springframework.integration.MessageChannel; import org.springframework.integration.MessageDeliveryException; @@ -194,7 +194,7 @@ public abstract class AbstractMessageRouter extends AbstractMessageHandler { protected ConversionService getRequiredConversionService() { if (this.getConversionService() == null) { - this.setConversionService(ConversionServiceFactory.createDefaultConversionService()); + this.setConversionService(new DefaultConversionService()); } return this.getConversionService(); } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/transformer/MapToObjectTransformer.java b/spring-integration-core/src/main/java/org/springframework/integration/transformer/MapToObjectTransformer.java index 07640e58ef..cb4f3c336f 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/transformer/MapToObjectTransformer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/transformer/MapToObjectTransformer.java @@ -22,7 +22,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.MutablePropertyValues; import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.core.convert.ConversionService; -import org.springframework.core.convert.support.ConversionServiceFactory; +import org.springframework.core.convert.support.DefaultConversionService; import org.springframework.util.Assert; import org.springframework.util.StringUtils; import org.springframework.validation.DataBinder; @@ -73,7 +73,7 @@ public class MapToObjectTransformer extends AbstractPayloadTransformer, conversionService = ((ConfigurableBeanFactory)this.getBeanFactory()).getConversionService(); } if (conversionService == null){ - conversionService = ConversionServiceFactory.createDefaultConversionService(); + conversionService = new DefaultConversionService(); } binder.setConversionService(conversionService); binder.bind(new MutablePropertyValues(payload)); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayProxyFactoryBeanTests.java b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayProxyFactoryBeanTests.java index a17d07c901..b1ff7fc770 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayProxyFactoryBeanTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayProxyFactoryBeanTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.gateway; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - import java.lang.reflect.Method; import java.util.Random; import java.util.concurrent.CountDownLatch; @@ -28,12 +25,11 @@ import java.util.concurrent.TimeUnit; import org.junit.Test; import org.mockito.Mockito; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.core.convert.converter.Converter; -import org.springframework.core.convert.support.ConversionServiceFactory; +import org.springframework.core.convert.support.DefaultConversionService; import org.springframework.core.convert.support.GenericConversionService; import org.springframework.integration.Message; import org.springframework.integration.MessageChannel; @@ -46,6 +42,9 @@ import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.message.GenericMessage; import org.springframework.util.ReflectionUtils; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + /** * @author Mark Fisher * @author Oleg Zhurakousky @@ -70,7 +69,7 @@ public class GatewayProxyFactoryBeanTests { public void testRequestReplyWithAnonymousChannelConvertedTypeViaConversionService() throws Exception { QueueChannel requestChannel = new QueueChannel(); startResponder(requestChannel); - GenericConversionService cs = ConversionServiceFactory.createDefaultConversionService(); + GenericConversionService cs = new DefaultConversionService(); Converter stringToByteConverter = new Converter() { public byte[] convert(String source) { return source.getBytes(); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/MapToObjectTransformerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/MapToObjectTransformerTests.java index c5fcabd4c1..4550cad1f3 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/MapToObjectTransformerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/transformer/MapToObjectTransformerTests.java @@ -16,10 +16,6 @@ package org.springframework.integration.transformer; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertNotNull; -import static junit.framework.Assert.assertNull; - import java.util.HashMap; import java.util.Map; @@ -28,11 +24,15 @@ import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.context.support.StaticApplicationContext; import org.springframework.core.convert.converter.Converter; -import org.springframework.core.convert.support.ConversionServiceFactory; +import org.springframework.core.convert.support.DefaultConversionService; import org.springframework.core.convert.support.GenericConversionService; import org.springframework.integration.Message; import org.springframework.integration.support.MessageBuilder; +import static junit.framework.Assert.assertEquals; +import static junit.framework.Assert.assertNotNull; +import static junit.framework.Assert.assertNull; + /** * @author Oleg Zhurakousky * @since 2.0 @@ -113,7 +113,7 @@ public class MapToObjectTransformerTests { private ConfigurableBeanFactory getBeanFactory(){ DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory(); - GenericConversionService conversionService = ConversionServiceFactory.createDefaultConversionService(); + GenericConversionService conversionService = new DefaultConversionService(); beanFactory.setConversionService(conversionService); return beanFactory; } diff --git a/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/store/KeyValueMessageGroup.java b/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/store/KeyValueMessageGroup.java index 525c2c87cd..97ded86221 100644 --- a/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/store/KeyValueMessageGroup.java +++ b/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/store/KeyValueMessageGroup.java @@ -33,6 +33,7 @@ import org.springframework.integration.store.MessageGroup; * @author Josh Long * @since 2.1 */ +@SuppressWarnings("serial") public class KeyValueMessageGroup implements MessageGroup, Serializable { /** diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcMessageHandler.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcMessageHandler.java index f3be394a61..199ad48ab6 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcMessageHandler.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcMessageHandler.java @@ -26,9 +26,9 @@ import org.springframework.integration.MessageRejectedException; import org.springframework.integration.handler.AbstractMessageHandler; import org.springframework.jdbc.core.JdbcOperations; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; +import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations; +import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; import org.springframework.jdbc.core.namedparam.SqlParameterSource; -import org.springframework.jdbc.core.simple.SimpleJdbcOperations; -import org.springframework.jdbc.core.simple.SimpleJdbcTemplate; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.jdbc.support.KeyHolder; import org.springframework.util.LinkedCaseInsensitiveMap; @@ -50,7 +50,7 @@ import org.springframework.util.LinkedCaseInsensitiveMap; */ public class JdbcMessageHandler extends AbstractMessageHandler { - private final SimpleJdbcOperations jdbcOperations; + private final NamedParameterJdbcOperations jdbcOperations; private volatile String updateSql; @@ -66,7 +66,7 @@ public class JdbcMessageHandler extends AbstractMessageHandler { * @param updateSql query to execute */ public JdbcMessageHandler(DataSource dataSource, String updateSql) { - this.jdbcOperations = new SimpleJdbcTemplate(dataSource); + this.jdbcOperations = new NamedParameterJdbcTemplate(dataSource); this.updateSql = updateSql; } @@ -78,7 +78,7 @@ public class JdbcMessageHandler extends AbstractMessageHandler { * @param updateSql query to execute */ public JdbcMessageHandler(JdbcOperations jdbcOperations, String updateSql) { - this.jdbcOperations = new SimpleJdbcTemplate(jdbcOperations); + this.jdbcOperations = new NamedParameterJdbcTemplate(jdbcOperations); this.updateSql = updateSql; } @@ -116,7 +116,7 @@ public class JdbcMessageHandler extends AbstractMessageHandler { } if (keysGenerated) { KeyHolder keyHolder = new GeneratedKeyHolder(); - this.jdbcOperations.getNamedParameterJdbcOperations().update(this.updateSql, updateParameterSource, + this.jdbcOperations.update(this.updateSql, updateParameterSource, keyHolder); return keyHolder.getKeyList(); } diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcPollingChannelAdapter.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcPollingChannelAdapter.java index 874cb9c073..d593127e69 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcPollingChannelAdapter.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcPollingChannelAdapter.java @@ -33,9 +33,9 @@ import org.springframework.jdbc.core.JdbcOperations; import org.springframework.jdbc.core.ResultSetExtractor; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.RowMapperResultSetExtractor; +import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations; +import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; import org.springframework.jdbc.core.namedparam.SqlParameterSource; -import org.springframework.jdbc.core.simple.SimpleJdbcOperations; -import org.springframework.jdbc.core.simple.SimpleJdbcTemplate; /** * A polling channel adapter that creates messages from the payload returned by @@ -48,7 +48,7 @@ import org.springframework.jdbc.core.simple.SimpleJdbcTemplate; */ public class JdbcPollingChannelAdapter extends IntegrationObjectSupport implements MessageSource { - private final SimpleJdbcOperations jdbcOperations; + private final NamedParameterJdbcOperations jdbcOperations; private final String selectQuery; @@ -72,7 +72,7 @@ public class JdbcPollingChannelAdapter extends IntegrationObjectSupport implemen * @param selectQuery query to execute */ public JdbcPollingChannelAdapter(DataSource dataSource, String selectQuery) { - this.jdbcOperations = new SimpleJdbcTemplate(dataSource); + this.jdbcOperations = new NamedParameterJdbcTemplate(dataSource); this.selectQuery = selectQuery; } @@ -84,7 +84,7 @@ public class JdbcPollingChannelAdapter extends IntegrationObjectSupport implemen * @param selectQuery query to execute */ public JdbcPollingChannelAdapter(JdbcOperations jdbcOperations, String selectQuery) { - this.jdbcOperations = new SimpleJdbcTemplate(jdbcOperations); + this.jdbcOperations = new NamedParameterJdbcTemplate(jdbcOperations); this.selectQuery = selectQuery; } @@ -192,7 +192,7 @@ public class JdbcPollingChannelAdapter extends IntegrationObjectSupport implemen } if (sqlQueryParameterSource != null) { - payload = this.jdbcOperations.getNamedParameterJdbcOperations().query(this.selectQuery, + payload = this.jdbcOperations.query(this.selectQuery, sqlQueryParameterSource, resultSetExtractor); } else { diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageHandlerIntegrationTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageHandlerIntegrationTests.java index 1b68c5fd4f..b9f9dd2465 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageHandlerIntegrationTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageHandlerIntegrationTests.java @@ -16,22 +16,21 @@ package org.springframework.integration.jdbc; -import static org.junit.Assert.assertEquals; - import java.util.Map; import org.junit.After; import org.junit.Before; import org.junit.Test; - import org.springframework.integration.Message; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.support.MessageBuilder; -import org.springframework.jdbc.core.simple.SimpleJdbcTemplate; +import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; +import static org.junit.Assert.assertEquals; + /** * @author Dave Syer */ @@ -39,7 +38,7 @@ public class JdbcMessageHandlerIntegrationTests { private EmbeddedDatabase embeddedDatabase; - private SimpleJdbcTemplate jdbcTemplate; + private JdbcTemplate jdbcTemplate; @Before public void setUp() { @@ -47,7 +46,7 @@ public class JdbcMessageHandlerIntegrationTests { builder.setType(EmbeddedDatabaseType.HSQL).addScript( "classpath:org/springframework/integration/jdbc/messageHandlerIntegrationTest.sql"); this.embeddedDatabase = builder.build(); - this.jdbcTemplate = new SimpleJdbcTemplate(this.embeddedDatabase); + this.jdbcTemplate = new JdbcTemplate(this.embeddedDatabase); } @After @@ -57,9 +56,9 @@ public class JdbcMessageHandlerIntegrationTests { @Test public void testSimpleStaticInsert() { - JdbcMessageHandler handler = new JdbcMessageHandler(jdbcTemplate.getJdbcOperations(), "insert into foos (id, status, name) values (1, 0, 'foo')"); + JdbcMessageHandler handler = new JdbcMessageHandler(jdbcTemplate, "insert into foos (id, status, name) values (1, 0, 'foo')"); Message message = new GenericMessage("foo"); - handler.handleMessage(message); + handler.handleMessage(message); Map map = jdbcTemplate.queryForMap("SELECT * FROM FOOS WHERE ID=?", 1); assertEquals("Wrong id", "1", map.get("ID")); assertEquals("Wrong status", 0, map.get("STATUS")); @@ -68,7 +67,7 @@ public class JdbcMessageHandlerIntegrationTests { @Test public void testSimpleDynamicInsert() { - JdbcMessageHandler handler = new JdbcMessageHandler(jdbcTemplate.getJdbcOperations(), "insert into foos (id, status, name) values (1, 0, :payload)"); + JdbcMessageHandler handler = new JdbcMessageHandler(jdbcTemplate, "insert into foos (id, status, name) values (1, 0, :payload)"); Message message = new GenericMessage("foo"); handler.handleMessage(message); Map map = jdbcTemplate.queryForMap("SELECT * FROM FOOS WHERE ID=?", 1); @@ -77,7 +76,7 @@ public class JdbcMessageHandlerIntegrationTests { @Test public void testIdHeaderDynamicInsert() { - JdbcMessageHandler handler = new JdbcMessageHandler(jdbcTemplate.getJdbcOperations(), "insert into foos (id, status, name) values (:headers[id], 0, :payload)"); + JdbcMessageHandler handler = new JdbcMessageHandler(jdbcTemplate, "insert into foos (id, status, name) values (:headers[id], 0, :payload)"); Message message = new GenericMessage("foo"); handler.handleMessage(message); String id = message.getHeaders().getId().toString(); @@ -88,7 +87,7 @@ public class JdbcMessageHandlerIntegrationTests { @Test public void testDottedHeaderDynamicInsert() { - JdbcMessageHandler handler = new JdbcMessageHandler(jdbcTemplate.getJdbcOperations(), "insert into foos (id, status, name) values (:headers[business.id], 0, :payload)"); + JdbcMessageHandler handler = new JdbcMessageHandler(jdbcTemplate, "insert into foos (id, status, name) values (:headers[business.id], 0, :payload)"); Message message = MessageBuilder.withPayload("foo").setHeader("business.id", "FOO").build(); handler.handleMessage(message); String id = message.getHeaders().get("business.id").toString(); diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcPollingChannelAdapterIntegrationTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcPollingChannelAdapterIntegrationTests.java index 4b64698941..8450577d6b 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcPollingChannelAdapterIntegrationTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcPollingChannelAdapterIntegrationTests.java @@ -16,10 +16,6 @@ package org.springframework.integration.jdbc; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Types; @@ -32,13 +28,17 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.springframework.integration.Message; +import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.namedparam.SqlParameterSource; -import org.springframework.jdbc.core.simple.SimpleJdbcTemplate; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + /** * @author Jonas Partner */ @@ -48,7 +48,7 @@ public class JdbcPollingChannelAdapterIntegrationTests { private EmbeddedDatabase embeddedDatabase; - private SimpleJdbcTemplate jdbcTemplate; + private JdbcTemplate jdbcTemplate; @Before public void setUp() { @@ -58,7 +58,7 @@ public class JdbcPollingChannelAdapterIntegrationTests { .addScript( "classpath:org/springframework/integration/jdbc/pollingChannelAdapterIntegrationTest.sql"); this.embeddedDatabase = builder.build(); - this.jdbcTemplate = new SimpleJdbcTemplate(this.embeddedDatabase); + this.jdbcTemplate = new JdbcTemplate(this.embeddedDatabase); } @After diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcMessageHandlerParserTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcMessageHandlerParserTests.java index dd49f52072..9f7d047a41 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcMessageHandlerParserTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcMessageHandlerParserTests.java @@ -13,9 +13,6 @@ package org.springframework.integration.jdbc.config; -import static junit.framework.Assert.assertTrue; -import static org.junit.Assert.assertEquals; - import java.util.Collections; import java.util.Map; @@ -32,7 +29,10 @@ import org.springframework.integration.jdbc.JdbcMessageHandler; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.test.util.TestUtils; import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.jdbc.core.simple.SimpleJdbcTemplate; + +import static junit.framework.Assert.assertTrue; + +import static org.junit.Assert.assertEquals; /** * @author Dave Syer @@ -44,7 +44,7 @@ import org.springframework.jdbc.core.simple.SimpleJdbcTemplate; */ public class JdbcMessageHandlerParserTests { - private SimpleJdbcTemplate jdbcTemplate; + private JdbcTemplate jdbcTemplate; private MessageChannel channel; @@ -125,7 +125,7 @@ public class JdbcMessageHandlerParserTests { public void setUp(String name, Class cls){ context = new ClassPathXmlApplicationContext(name, cls); - jdbcTemplate = new SimpleJdbcTemplate(this.context.getBean("dataSource",DataSource.class)); + jdbcTemplate = new JdbcTemplate(this.context.getBean("dataSource",DataSource.class)); channel = this.context.getBean("target", MessageChannel.class); } diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcOutboundGatewayParserTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcOutboundGatewayParserTests.java index 917a74a4b5..65dc05d53b 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcOutboundGatewayParserTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcOutboundGatewayParserTests.java @@ -12,10 +12,6 @@ */ package org.springframework.integration.jdbc.config; -import static junit.framework.Assert.assertTrue; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - import java.util.Collections; import java.util.Map; @@ -23,7 +19,6 @@ import javax.sql.DataSource; import org.junit.After; import org.junit.Test; - import org.springframework.context.ApplicationContext; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -35,7 +30,11 @@ import org.springframework.integration.jdbc.JdbcOutboundGateway; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.test.util.TestUtils; import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.jdbc.core.simple.SimpleJdbcTemplate; + +import static junit.framework.Assert.assertTrue; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; /** * @author Dave Syer @@ -46,7 +45,7 @@ import org.springframework.jdbc.core.simple.SimpleJdbcTemplate; */ public class JdbcOutboundGatewayParserTests { - private SimpleJdbcTemplate jdbcTemplate; + private JdbcTemplate jdbcTemplate; private MessageChannel channel; @@ -133,7 +132,7 @@ public class JdbcOutboundGatewayParserTests { public void setUp(String name, Class cls) { context = new ClassPathXmlApplicationContext(name, cls); - jdbcTemplate = new SimpleJdbcTemplate(this.context.getBean("dataSource", DataSource.class)); + jdbcTemplate = new JdbcTemplate(this.context.getBean("dataSource", DataSource.class)); channel = this.context.getBean("target", MessageChannel.class); setupMessagingTemplate(); } diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcPollingChannelAdapterParserTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcPollingChannelAdapterParserTests.java index 6a33bc16e5..44d22080bf 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcPollingChannelAdapterParserTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcPollingChannelAdapterParserTests.java @@ -16,11 +16,6 @@ package org.springframework.integration.jdbc.config; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - import java.util.List; import java.util.Map; import java.util.Properties; @@ -36,20 +31,25 @@ import org.springframework.integration.core.MessagingTemplate; import org.springframework.integration.core.PollableChannel; import org.springframework.integration.history.MessageHistory; import org.springframework.integration.test.util.TestUtils; +import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.namedparam.AbstractSqlParameterSource; -import org.springframework.jdbc.core.simple.SimpleJdbcTemplate; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.TransactionStatus; import org.springframework.transaction.support.TransactionCallback; import org.springframework.transaction.support.TransactionTemplate; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + // Not transactional because the poller threads need access to the data // @Transactional public class JdbcPollingChannelAdapterParserTests { final long receiveTimeout = 5000; - private SimpleJdbcTemplate jdbcTemplate; + private JdbcTemplate jdbcTemplate; private MessagingTemplate messagingTemplate; @@ -171,7 +171,7 @@ public class JdbcPollingChannelAdapterParserTests { } protected void setupJdbcTemplate() { - this.jdbcTemplate = new SimpleJdbcTemplate(this.appCtx.getBean("dataSource", DataSource.class)); + this.jdbcTemplate = new JdbcTemplate(this.appCtx.getBean("dataSource", DataSource.class)); } protected void setupTransactionManager() { diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/config/XPathExpressionParser.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/config/XPathExpressionParser.java index 24bf68e4a9..71bead6d25 100644 --- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/config/XPathExpressionParser.java +++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/config/XPathExpressionParser.java @@ -19,18 +19,18 @@ package org.springframework.integration.xml.config; import java.util.HashMap; import java.util.Map; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser; import org.springframework.beans.factory.xml.BeanDefinitionParserDelegate; import org.springframework.beans.factory.xml.ParserContext; +import org.springframework.core.env.StandardEnvironment; import org.springframework.util.Assert; import org.springframework.util.StringUtils; import org.springframework.xml.xpath.XPathExpressionFactory; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; /** * Parser for the <xpath-expression> element. @@ -99,8 +99,8 @@ public class XPathExpressionParser extends AbstractSingleBeanDefinitionParser { } protected Map parseNamespaceMapElement(Element element, ParserContext parserContext, BeanDefinition parentDefinition) { - BeanDefinitionParserDelegate beanParser = new BeanDefinitionParserDelegate(parserContext.getReaderContext()); - beanParser.initDefaults(element.getOwnerDocument().getDocumentElement()); + BeanDefinitionParserDelegate beanParser = new BeanDefinitionParserDelegate(parserContext.getReaderContext(), new StandardEnvironment()); + beanParser.initDefaults(element.getOwnerDocument().getDocumentElement(), beanParser); return beanParser.parseMapElement(element, parentDefinition); } diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/router/XPathRouter.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/router/XPathRouter.java index 3814aac8b0..ddb24fb791 100644 --- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/router/XPathRouter.java +++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/router/XPathRouter.java @@ -21,9 +21,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.w3c.dom.DOMException; -import org.w3c.dom.Node; - import org.springframework.integration.Message; import org.springframework.integration.router.AbstractMessageRouter; import org.springframework.integration.xml.DefaultXmlPayloadConverter; @@ -32,6 +29,8 @@ import org.springframework.util.Assert; import org.springframework.xml.xpath.NodeMapper; import org.springframework.xml.xpath.XPathExpression; import org.springframework.xml.xpath.XPathExpressionFactory; +import org.w3c.dom.DOMException; +import org.w3c.dom.Node; /** * Message Router that uses {@link XPathExpression} evaluation to determine channel names. @@ -41,7 +40,7 @@ import org.springframework.xml.xpath.XPathExpressionFactory; */ public class XPathRouter extends AbstractMessageRouter { - private volatile NodeMapper nodeMapper = new TextContentNodeMapper(); + private volatile NodeMapper nodeMapper = new TextContentNodeMapper(); private final XPathExpression xPathExpression; @@ -114,7 +113,6 @@ public class XPathRouter extends AbstractMessageRouter { } @Override - @SuppressWarnings("unchecked") protected List getChannelIdentifiers(Message message) { Node node = this.converter.convertToNode(message.getPayload()); if (this.evaluateAsString){ @@ -126,7 +124,7 @@ public class XPathRouter extends AbstractMessageRouter { } - private static class TextContentNodeMapper implements NodeMapper { + private static class TextContentNodeMapper implements NodeMapper { public Object mapNode(Node node, int nodeNum) throws DOMException { return node.getTextContent(); diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/splitter/XPathMessageSplitter.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/splitter/XPathMessageSplitter.java index 35a3a0035b..7cbed3ba2c 100644 --- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/splitter/XPathMessageSplitter.java +++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/splitter/XPathMessageSplitter.java @@ -132,7 +132,6 @@ public class XPathMessageSplitter extends AbstractMessageSplitter { return splitStrings; } - @SuppressWarnings("unchecked") private List splitNode(Node node) throws ParserConfigurationException { List nodeList = this.xpathExpression.evaluateAsNodeList(node); if (nodeList.size() == 0) { diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/XPathTransformer.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/XPathTransformer.java index b785b4ef4a..79732654cd 100644 --- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/XPathTransformer.java +++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/XPathTransformer.java @@ -50,7 +50,7 @@ public class XPathTransformer extends AbstractTransformer { private volatile XPathEvaluationType evaluationType = XPathEvaluationType.STRING_RESULT; - private volatile NodeMapper nodeMapper; + private volatile NodeMapper nodeMapper; /** @@ -84,7 +84,7 @@ public class XPathTransformer extends AbstractTransformer { * but if explicitly set, type determination is the responsibility of the NodeMapper, taking precedence * over any configured evaluationType. */ - public void setNodeMapper(NodeMapper nodeMapper) { + public void setNodeMapper(NodeMapper nodeMapper) { this.nodeMapper = nodeMapper; } diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathTransformerParserTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathTransformerParserTests.java index 8940d1cc28..945eb75ba7 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathTransformerParserTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathTransformerParserTests.java @@ -137,7 +137,7 @@ public class XPathTransformerParserTests { @SuppressWarnings("unused") - private static class TestNodeMapper implements NodeMapper { + private static class TestNodeMapper implements NodeMapper { public Object mapNode(Node node, int nodeNum) throws DOMException { return node.getTextContent() + "-mapped"; diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XPathTransformerTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XPathTransformerTests.java index 493069a854..3f3bb31d98 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XPathTransformerTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XPathTransformerTests.java @@ -137,7 +137,7 @@ public class XPathTransformerTests { } - private static class TestNodeMapper implements NodeMapper { + private static class TestNodeMapper implements NodeMapper { public Object mapNode(Node node, int nodeNum) throws DOMException { return node.getTextContent() + "-mapped";