changed the access of the "reconcileColumnsToUse" and "reconcileParameters" methods to protected (SPR-7556)

Author: Thomas Risberg

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

@@ -219,7 +219,7 @@ public boolean isAccessCallParameterMetaData() {
 	 * Create a ReturnResultSetParameter/SqlOutParameter depending on the support provided
 	 * by the JDBC driver used for the database in use.
 	 * @param parameterName the name of the parameter (also used as the name of the List returned in the output)
-	 * @param rowMapper a RowMapper implementation used to map the data retuned in the result set
+	 * @param rowMapper a RowMapper implementation used to map the data returned in the result set
 	 * @return the appropriate SqlParameter
 	 */
 	public SqlParameter createReturnResultSetParameter(String parameterName, RowMapper rowMapper) {
@@ -268,7 +268,7 @@ public void initializeMetaData(DataSource dataSource) {
 	}
 
 	/**
-	 * Process the list of parameters provided and if procedure column metedata is used the
+	 * Process the list of parameters provided and if procedure column metadata is used the
 	 * parameters will be matched against the metadata information and any missing ones will
 	 * be automatically included
 	 * @param parameters the list of parameters to use as a base
@@ -280,7 +280,7 @@ public void processParameters(List<SqlParameter> parameters) {
 	/**
 	 * Reconcile the provided parameters with available metadata and add new ones where appropriate
 	 */
-	private List<SqlParameter> reconcileParameters(List<SqlParameter> parameters) {
+	protected List<SqlParameter> reconcileParameters(List<SqlParameter> parameters) {
 		final List<SqlParameter> declaredReturnParameters = new ArrayList<SqlParameter>();
 		final Map<String, SqlParameter> declaredParameters = new LinkedHashMap<String, SqlParameter>();
 		boolean returnDeclared = false;

org.springframework.jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataContext.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2010 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.
@@ -135,7 +135,7 @@ public void setOverrideIncludeSynonymsDefault(boolean override) {
 	}
 
 	/**
-	 * Are we overrding include synonyms default?
+	 * Are we overriding include synonyms default?
 	 */
 	public boolean isOverrideIncludeSynonymsDefault() {
 		return this.overrideIncludeSynonymsDefault;
@@ -149,7 +149,7 @@ public List<String> getTableColumns() {
 	}
 
 	/**
-	 * Does this database support the JDBC 3.0 feature of retreiving generated keys
+	 * Does this database support the JDBC 3.0 feature of retrieving generated keys
 	 * {@link java.sql.DatabaseMetaData#supportsGetGeneratedKeys()}?
 	 */
 	public boolean isGetGeneratedKeysSupported() {
@@ -175,7 +175,7 @@ public String getSimulationQueryForGetGeneratedKey(String tableName, String keyC
 	}
 
 	/**
-	 * Is a column name String array for retreiving generated keys supported
+	 * Is a column name String array for retrieving generated keys supported
 	 * {@link java.sql.Connection#createStruct(String, Object[])}?
 	 */
 	public boolean isGeneratedKeysColumnNameArraySupported() {
@@ -186,7 +186,7 @@ public boolean isGeneratedKeysColumnNameArraySupported() {
 	/**
 	 * Process the current meta data with the provided configuration options
 	 * @param dataSource the DataSource being used
-	 * @param declaredColumns any coluns that are declared
+	 * @param declaredColumns any columns that are declared
 	 * @param generatedKeyNames name of generated keys
 	 */
 	public void processMetaData(DataSource dataSource, List<String> declaredColumns, String[] generatedKeyNames) {
@@ -199,7 +199,7 @@ public void processMetaData(DataSource dataSource, List<String> declaredColumns,
 	 * @param declaredColumns declared column names
 	 * @param generatedKeyNames names of generated key columns
 	 */
-	private List<String> reconcileColumnsToUse(List<String> declaredColumns, String[] generatedKeyNames) {
+	protected List<String> reconcileColumnsToUse(List<String> declaredColumns, String[] generatedKeyNames) {
 		if (generatedKeyNames.length > 0) {
 			generatedKeyColumnsUsed = true;
 		}