RESOLVED - issue BATCH-1112: Remove cycle in infrastructure database/support (move support class up a level)

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcBatchItemWriter.java

@@ -25,7 +25,6 @@ import javax.sql.DataSource;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.batch.item.ItemWriter;
-import org.springframework.batch.item.database.support.JdbcParameterUtils;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.EmptyResultDataAccessException;

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcParameterUtils.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.item.database.support;
+package org.springframework.batch.item.database;
 
 import java.util.Map;
 import java.util.HashMap;

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/AbstractSqlPagingQueryProvider.java

@@ -20,6 +20,7 @@ import javax.sql.DataSource;
 
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
+import org.springframework.batch.item.database.JdbcParameterUtils;
 import org.springframework.batch.item.database.PagingQueryProvider;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 

spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcParameterUtilsTests.java

@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.item.database.support;
+package org.springframework.batch.item.database;
 
 import static org.junit.Assert.*;
 import org.junit.Test;
+import org.springframework.batch.item.database.JdbcParameterUtils;
 
 import java.util.List;
 import java.util.ArrayList;

spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/ClassifierCompositeItemWriterTests.java

@@ -0,0 +1,61 @@
+/*
+ * Copyright 2006-2007 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.batch.item.support;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.Test;
+import org.springframework.batch.item.ItemWriter;
+import org.springframework.batch.support.PatternMatchingClassifier;
+
+/**
+ * @author Dave Syer
+ *
+ */
+public class ClassifierCompositeItemWriterTests {
+	
+	private ClassifierCompositeItemWriter<String> writer = new ClassifierCompositeItemWriter<String>();
+	private List<String> defaults = new ArrayList<String>();
+	private List<String> foos = new ArrayList<String>();
+
+	@Test
+	public void testWrite() throws Exception {
+		Map<String, ItemWriter<? super String>> map = new HashMap<String, ItemWriter<? super String>>();
+		ItemWriter<String> fooWriter = new ItemWriter<String>() {
+			public void write(List<? extends String> items) throws Exception {
+				foos.addAll(items);
+			}
+		};
+		ItemWriter<String> defaultWriter = new ItemWriter<String>() {
+			public void write(List<? extends String> items) throws Exception {
+				defaults.addAll(items);
+			}
+		};
+		map.put("foo", fooWriter );
+		map.put("*", defaultWriter);
+		writer.setClassifier(new PatternMatchingClassifier<ItemWriter<? super String>>(map));
+		writer.write(Arrays.asList("foo", "foo", "bar"));
+		assertEquals("[foo, foo]", foos.toString());
+		assertEquals("[bar]", defaults.toString());
+	}
+
+}