Add missing author tags and sync SQL script support for JDBC & R2DBC

spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/CannotReadScriptException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2021 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.
@@ -29,7 +29,7 @@ import org.springframework.core.io.support.EncodedResource;
 public class CannotReadScriptException extends ScriptException {
 
 	/**
-	 * Construct a new {@code CannotReadScriptException}.
+	 * Create a new {@code CannotReadScriptException}.
 	 * @param resource the resource that cannot be read from
 	 * @param cause the underlying cause of the resource access failure
 	 */

spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/CompositeDatabasePopulator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2021 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.
@@ -23,6 +23,8 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
+import org.springframework.util.Assert;
+
 /**
  * Composite {@link DatabasePopulator} that delegates to a list of given
  * {@code DatabasePopulator} implementations, executing all scripts.
@@ -52,6 +54,7 @@ public class CompositeDatabasePopulator implements DatabasePopulator {
 	 * @since 4.3
 	 */
 	public CompositeDatabasePopulator(Collection<DatabasePopulator> populators) {
+		Assert.notNull(populators, "DatabasePopulators must not be null");
 		this.populators.addAll(populators);
 	}
 
@@ -61,6 +64,7 @@ public class CompositeDatabasePopulator implements DatabasePopulator {
 	 * @since 4.3
 	 */
 	public CompositeDatabasePopulator(DatabasePopulator... populators) {
+		Assert.notNull(populators, "DatabasePopulators must not be null");
 		this.populators.addAll(Arrays.asList(populators));
 	}
 
@@ -69,6 +73,7 @@ public class CompositeDatabasePopulator implements DatabasePopulator {
 	 * Specify one or more populators to delegate to.
 	 */
 	public void setPopulators(DatabasePopulator... populators) {
+		Assert.notNull(populators, "DatabasePopulators must not be null");
 		this.populators.clear();
 		this.populators.addAll(Arrays.asList(populators));
 	}
@@ -77,12 +82,13 @@ public class CompositeDatabasePopulator implements DatabasePopulator {
 	 * Add one or more populators to the list of delegates.
 	 */
 	public void addPopulators(DatabasePopulator... populators) {
+		Assert.notNull(populators, "DatabasePopulators must not be null");
 		this.populators.addAll(Arrays.asList(populators));
 	}
 
-
 	@Override
 	public void populate(Connection connection) throws SQLException, ScriptException {
+		Assert.notNull(connection, "Connection must not be null");
 		for (DatabasePopulator populator : this.populators) {
 			populator.populate(connection);
 		}

spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/ScriptException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2021 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.
@@ -30,7 +30,7 @@ import org.springframework.lang.Nullable;
 public abstract class ScriptException extends DataAccessException {
 
 	/**
-	 * Constructor for {@code ScriptException}.
+	 * Create a new {@code ScriptException}.
 	 * @param message the detail message
 	 */
 	public ScriptException(String message) {
@@ -38,7 +38,7 @@ public abstract class ScriptException extends DataAccessException {
 	}
 
 	/**
-	 * Constructor for {@code ScriptException}.
+	 * Create a new {@code ScriptException}.
 	 * @param message the detail message
 	 * @param cause the root cause
 	 */

spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/ScriptParseException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2021 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.
@@ -29,7 +29,7 @@ import org.springframework.lang.Nullable;
 public class ScriptParseException extends ScriptException {
 
 	/**
-	 * Construct a new {@code ScriptParseException}.
+	 * Create a new {@code ScriptParseException}.
 	 * @param message detailed message
 	 * @param resource the resource from which the SQL script was read
 	 */
@@ -38,7 +38,7 @@ public class ScriptParseException extends ScriptException {
 	}
 
 	/**
-	 * Construct a new {@code ScriptParseException}.
+	 * Create a new {@code ScriptParseException}.
 	 * @param message detailed message
 	 * @param resource the resource from which the SQL script was read
 	 * @param cause the underlying cause of the failure

spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/UncategorizedScriptException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2021 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.
@@ -28,7 +28,7 @@ package org.springframework.jdbc.datasource.init;
 public class UncategorizedScriptException extends ScriptException {
 
 	/**
-	 * Construct a new {@code UncategorizedScriptException}.
+	 * Create a new {@code UncategorizedScriptException}.
 	 * @param message detailed message
 	 */
 	public UncategorizedScriptException(String message) {
@@ -36,7 +36,7 @@ public class UncategorizedScriptException extends ScriptException {
 	}
 
 	/**
-	 * Construct a new {@code UncategorizedScriptException}.
+	 * Create a new {@code UncategorizedScriptException}.
 	 * @param message detailed message
 	 * @param cause the root cause
 	 */