Add JDBC SP JavaConfig Test

Polishing according Java 6 target style

spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcJavaConfigTests.java

@@ -0,0 +1,124 @@
+/*
+ * Copyright 2015 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.integration.jdbc;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
+
+import java.sql.Types;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import javax.sql.DataSource;
+
+import org.hamcrest.Matchers;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.integration.annotation.InboundChannelAdapter;
+import org.springframework.integration.annotation.Poller;
+import org.springframework.integration.channel.QueueChannel;
+import org.springframework.integration.config.EnableIntegration;
+import org.springframework.integration.core.MessageSource;
+import org.springframework.integration.jdbc.storedproc.PrimeMapper;
+import org.springframework.integration.jdbc.storedproc.ProcedureParameter;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.jdbc.core.SqlParameter;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
+import org.springframework.messaging.Message;
+import org.springframework.messaging.PollableChannel;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * Equivalent to {@link StoredProcPollingChannelAdapterWithNamespaceIntegrationTests}.
+ *
+ * @author Gary Russell
+ * @since 4.2
+ *
+ */
+@ContextConfiguration(classes = StoredProcJavaConfigTests.Config.class)
+@RunWith(SpringJUnit4ClassRunner.class)
+@DirtiesContext
+public class StoredProcJavaConfigTests {
+
+	@Autowired
+	private PollableChannel fooChannel;
+
+	@Test
+	public void test() {
+		Message<?> received = fooChannel.receive(10000);
+		assertNotNull(received);
+		Collection<?> primes = (Collection<?>) received.getPayload();
+		assertThat(primes, Matchers.<Object>contains(2, 3, 5, 7));
+		received = fooChannel.receive(100);
+		assertNull(received);
+	}
+
+	@Configuration
+	@EnableIntegration
+	public static class Config {
+
+		@Bean
+		public PollableChannel fooChannel() {
+			return new QueueChannel();
+		}
+
+		@Bean
+		@InboundChannelAdapter(value = "fooChannel", poller = @Poller(fixedDelay="5000", maxMessagesPerPoll = "1"))
+		public MessageSource<?> storedProc() {
+			StoredProcPollingChannelAdapter source = new StoredProcPollingChannelAdapter(storedProcExecutor());
+			source.setExpectSingleResult(true);
+			return source;
+		}
+
+		@Bean
+		public StoredProcExecutor storedProcExecutor() {
+			StoredProcExecutor executor = new StoredProcExecutor(dataSource());
+			executor.setIgnoreColumnMetaData(true);
+			executor.setStoredProcedureName("GET_PRIME_NUMBERS");
+			List<ProcedureParameter> procedureParameters = new ArrayList<ProcedureParameter>();
+			procedureParameters.add(new ProcedureParameter("beginRange", 1, null));
+			procedureParameters.add(new ProcedureParameter("endRange", 10, null));
+			executor.setProcedureParameters(procedureParameters);
+			List<SqlParameter> sqlParameters = new ArrayList<SqlParameter>();
+			sqlParameters.add(new SqlParameter("beginRange", Types.INTEGER));
+			sqlParameters.add(new SqlParameter("endRange", Types.INTEGER));
+			executor.setSqlParameters(sqlParameters);
+			executor.setReturningResultSetRowMappers(Collections.<String, RowMapper<?>>singletonMap("out", new PrimeMapper()));
+			return executor;
+		}
+
+		@Bean
+		public DataSource dataSource() {
+			return new EmbeddedDatabaseBuilder()
+				.setType(EmbeddedDatabaseType.H2)
+				.addScript("classpath:h2-stored-procedures.sql")
+				.build();
+		}
+
+	}
+
+}

spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcPollingChannelAdapterWithNamespaceIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,9 @@
 
 package org.springframework.integration.jdbc;
 
+import static org.hamcrest.Matchers.contains;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertThat;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -40,6 +41,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /**
  * @author Gunnar Hillert
+ * @author Gary Russell
  */
 @ContextConfiguration
 @RunWith(SpringJUnit4ClassRunner.class)
@@ -67,12 +69,7 @@ public class StoredProcPollingChannelAdapterWithNamespaceIntegrationTests {
 
         List<Integer> primeNumbers = (List<Integer>) message.getPayload();
 
-        assertTrue(primeNumbers.size() == 4);
-
-        assertTrue(Integer.valueOf(2).equals(primeNumbers.get(0)));
-        assertTrue(Integer.valueOf(3).equals(primeNumbers.get(1)));
-        assertTrue(Integer.valueOf(5).equals(primeNumbers.get(2)));
-        assertTrue(Integer.valueOf(7).equals(primeNumbers.get(3)));
+		assertThat(primeNumbers, contains(2, 3, 5, 7));
 
     }