Merge branch '5.3.x'

# Conflicts:
#	spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java
#	spring-orm/src/main/java/org/springframework/orm/jpa/JpaVendorAdapter.java

Author: sbrannen

spring-jdbc/src/main/java/org/springframework/jdbc/core/ArgumentPreparedStatementSetter.java

@@ -54,7 +54,7 @@ public void setValues(PreparedStatement ps) throws SQLException {
 
 	/**
 	 * Set the value for prepared statements specified parameter index using the passed in value.
-	 * This method can be overridden by sub-classes if needed.
+	 * This method can be overridden by subclasses if needed.
 	 * @param ps the PreparedStatement
 	 * @param parameterPosition index of the parameter position
 	 * @param argValue the value to set

spring-jdbc/src/main/java/org/springframework/jdbc/core/ArgumentTypePreparedStatementSetter.java

@@ -85,7 +85,7 @@ public void setValues(PreparedStatement ps) throws SQLException {
 
 	/**
 	 * Set the value for the prepared statement's specified parameter position using the passed in
-	 * value and type. This method can be overridden by sub-classes if needed.
+	 * value and type. This method can be overridden by subclasses if needed.
 	 * @param ps the PreparedStatement
 	 * @param parameterPosition index of the parameter position
 	 * @param argType the argument type

spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCreatorFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -109,7 +109,7 @@ public void setUpdatableResults(boolean updatableResults) {
 
 
 	/**
-	 * Return a new CallableStatementCreator instance given this parameters.
+	 * Return a new CallableStatementCreator instance given these parameters.
 	 * @param params list of parameters (may be {@code null})
 	 */
 	public CallableStatementCreator newCallableStatementCreator(@Nullable Map<String, ?> params) {

spring-jdbc/src/main/java/org/springframework/jdbc/core/ColumnMapRowMapper.java

@@ -84,7 +84,7 @@ protected String getColumnKey(String columnName) {
 	 * Retrieve a JDBC object value for the specified column.
 	 * <p>The default implementation uses the {@code getObject} method.
 	 * Additionally, this implementation includes a "hack" to get around Oracle
-	 * returning a non standard object for their TIMESTAMP data type.
+	 * returning a non-standard object for their TIMESTAMP data type.
 	 * @param rs the ResultSet holding the data
 	 * @param index the column index
 	 * @return the Object returned

spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcOperations.java

@@ -234,7 +234,7 @@ public interface JdbcOperations {
 	 * Each element in the list will be of the form returned by this interface's
 	 * {@code queryForMap} methods.
 	 * @param sql the SQL query to execute
-	 * @return an List that contains a Map per row
+	 * @return a List that contains a Map per row
 	 * @throws DataAccessException if there is any problem executing the query
 	 * @see #queryForList(String, Object...)
 	 */

spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java

@@ -111,7 +111,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
 	private static final String RETURN_UPDATE_COUNT_PREFIX = "#update-count-";
 
 
-	/** If this variable is false, we will throw exceptions on SQL warnings. */
+	/** If this variable is {@code false}, we will throw exceptions on SQL warnings. */
 	private boolean ignoreWarnings = true;
 
 	/**
@@ -149,7 +149,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
 
 	/**
 	 * If this variable is set to true then execution of a CallableStatement will return
-	 * the results in a Map that uses case insensitive names for the parameters.
+	 * the results in a Map that uses case-insensitive names for the parameters.
 	 */
 	private boolean resultsMapCaseInsensitive = false;
 
@@ -187,7 +187,7 @@ public JdbcTemplate(DataSource dataSource, boolean lazyInit) {
 
 
 	/**
-	 * Set whether or not we want to ignore SQLWarnings.
+	 * Set whether we want to ignore SQLWarnings.
 	 * <p>Default is "true", swallowing and logging all warnings. Switch this flag
 	 * to "false" to make the JdbcTemplate throw an SQLWarningException instead.
 	 * @see java.sql.SQLWarning
@@ -199,7 +199,7 @@ public void setIgnoreWarnings(boolean ignoreWarnings) {
 	}
 
 	/**
-	 * Return whether or not we ignore SQLWarnings.
+	 * Return whether we ignore SQLWarnings.
 	 */
 	public boolean isIgnoreWarnings() {
 		return this.ignoreWarnings;
@@ -303,15 +303,15 @@ public boolean isSkipUndeclaredResults() {
 
 	/**
 	 * Set whether execution of a CallableStatement will return the results in a Map
-	 * that uses case insensitive names for the parameters.
+	 * that uses case-insensitive names for the parameters.
 	 */
 	public void setResultsMapCaseInsensitive(boolean resultsMapCaseInsensitive) {
 		this.resultsMapCaseInsensitive = resultsMapCaseInsensitive;
 	}
 
 	/**
 	 * Return whether execution of a CallableStatement will return the results in a Map
-	 * that uses case insensitive names for the parameters.
+	 * that uses case-insensitive names for the parameters.
 	 */
 	public boolean isResultsMapCaseInsensitive() {
 		return this.resultsMapCaseInsensitive;

spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataContext.java

@@ -478,7 +478,7 @@ else if (meta.getParameterType() == DatabaseMetaData.procedureColumnInOut) {
 	 */
 	public Map<String, Object> matchInParameterValuesWithCallParameters(SqlParameterSource parameterSource) {
 		// For parameter source lookups we need to provide case-insensitive lookup support
-		// since the database meta-data is not necessarily providing case sensitive parameter names.
+		// since the database meta-data is not necessarily providing case-sensitive parameter names.
 		Map<String, String> caseInsensitiveParameterNames =
 				SqlParameterSourceUtils.extractCaseInsensitiveParameterNames(parameterSource);
 

spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplate.java

@@ -406,7 +406,7 @@ protected PreparedStatementCreator getPreparedStatementCreator(String sql, SqlPa
 	 * @param sql the SQL statement to execute
 	 * @param paramSource container of arguments to bind
 	 * @param customizer callback for setting further properties on the
-	 * {@link PreparedStatementCreatorFactory} in use), applied before the
+	 * {@link PreparedStatementCreatorFactory} in use, applied before the
 	 * actual {@code newPreparedStatementCreator} call
 	 * @return the corresponding {@link PreparedStatementCreator}
 	 * @since 5.0.5

spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/ParsedSql.java

@@ -69,7 +69,7 @@ void addNamedParameter(String parameterName, int startIndex, int endIndex) {
 	}
 
 	/**
-	 * Return all of the parameters (bind variables) in the parsed SQL statement.
+	 * Return all the parameters (bind variables) in the parsed SQL statement.
 	 * Repeated occurrences of the same parameter name are included here.
 	 */
 	List<String> getParameterNames() {
@@ -81,7 +81,7 @@ List<String> getParameterNames() {
 	 * @param parameterPosition the position of the parameter
 	 * (as index in the parameter names List)
 	 * @return the start index and end index, combined into
-	 * a int array of length 2
+	 * an int array of length 2
 	 */
 	int[] getParameterIndexes(int parameterPosition) {
 		return this.parameterIndexes.get(parameterPosition);
@@ -104,29 +104,29 @@ int getNamedParameterCount() {
 	}
 
 	/**
-	 * Set the count of all of the unnamed parameters in the SQL statement.
+	 * Set the count of all the unnamed parameters in the SQL statement.
 	 */
 	void setUnnamedParameterCount(int unnamedParameterCount) {
 		this.unnamedParameterCount = unnamedParameterCount;
 	}
 
 	/**
-	 * Return the count of all of the unnamed parameters in the SQL statement.
+	 * Return the count of all the unnamed parameters in the SQL statement.
 	 */
 	int getUnnamedParameterCount() {
 		return this.unnamedParameterCount;
 	}
 
 	/**
-	 * Set the total count of all of the parameters in the SQL statement.
+	 * Set the total count of all the parameters in the SQL statement.
 	 * Repeated occurrences of the same parameter name do count here.
 	 */
 	void setTotalParameterCount(int totalParameterCount) {
 		this.totalParameterCount = totalParameterCount;
 	}
 
 	/**
-	 * Return the total count of all of the parameters in the SQL statement.
+	 * Return the total count of all the parameters in the SQL statement.
 	 * Repeated occurrences of the same parameter name do count here.
 	 */
 	int getTotalParameterCount() {

spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/SqlParameterSourceUtils.java

@@ -106,9 +106,9 @@ public static Object getTypedValue(SqlParameterSource source, String parameterNa
 	}
 
 	/**
-	 * Create a Map of case insensitive parameter names together with the original name.
+	 * Create a Map of case-insensitive parameter names together with the original name.
 	 * @param parameterSource the source of parameter names
-	 * @return the Map that can be used for case insensitive matching of parameter names
+	 * @return the Map that can be used for case-insensitive matching of parameter names
 	 */
 	public static Map<String, String> extractCaseInsensitiveParameterNames(SqlParameterSource parameterSource) {
 		Map<String, String> caseInsensitiveParameterNames = new HashMap<>();