polish

Author: Keith Donald

org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/ResourceDatabasePopulator.java

@@ -21,6 +21,7 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -52,6 +53,14 @@ public void addScript(Resource script) {
 		scripts.add(script);
 	}
 
+	/**
+	 * Set the scripts to execute to populate the database.
+	 * @param scripts the scripts to execute
+	 */
+	public void setScripts(Resource[] scripts) {
+		this.scripts = Arrays.asList(scripts);
+	}
+
 	/**
 	 * Specify the encoding for SQL scripts, if different from the platform encoding.
 	 * Note setting this property has no effect on added scripts that are already {@link EncodedResource encoded resources}.
@@ -60,7 +69,7 @@ public void addScript(Resource script) {
 	public void setSqlScriptEncoding(String sqlScriptEncoding) {
 		this.sqlScriptEncoding = sqlScriptEncoding;
 	}
-
+	
 	public void populate(Connection connection) throws SQLException {
 		for (Resource script : scripts) {
 			executeSqlScript(connection, applyEncodingIfNecessary(script), false);

org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryBeanTests.java

@@ -6,16 +6,19 @@
 
 import org.junit.Test;
 import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
 import org.springframework.jdbc.core.JdbcTemplate;
 
 public class EmbeddedDatabaseFactoryBeanTests {
-	
+
 	@Test
 	public void testFactoryBeanLifecycle() throws Exception {
 		EmbeddedDatabaseFactoryBean bean = new EmbeddedDatabaseFactoryBean();
 		ResourceDatabasePopulator populator = new ResourceDatabasePopulator();
-		populator.addScript(new ClassPathResource("db-schema.sql", getClass()));
-		populator.addScript(new ClassPathResource("db-test-data.sql", getClass()));
+		populator.setScripts(new Resource[] {
+			new ClassPathResource("db-schema.sql", getClass()),
+			new ClassPathResource("db-test-data.sql", getClass())
+		});
 		bean.setDatabasePopulator(populator);
 		bean.afterPropertiesSet();
 		DataSource ds = bean.getObject();