githubzz
diff --git a/‎spring-core/src/main/java/org/springframework/util/LinkedCaseInsensitiveMap.java
Lines changed: 3 additions & 1 deletion b/‎spring-core/src/main/java/org/springframework/util/LinkedCaseInsensitiveMap.java
Lines changed: 3 additions & 1 deletion
diff --git a/‎spring-jdbc/src/main/java/org/springframework/jdbc/core/ColumnMapRowMapper.java
Lines changed: 5 additions & 6 deletions b/‎spring-jdbc/src/main/java/org/springframework/jdbc/core/ColumnMapRowMapper.java
Lines changed: 5 additions & 6 deletions
diff --git a/‎spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataContext.java
Lines changed: 0 additions & 1 deletion b/‎spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataContext.java
Lines changed: 0 additions & 1 deletion
diff --git a/‎spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java
Lines changed: 2 additions & 1 deletion b/‎spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java
Lines changed: 2 additions & 1 deletion
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -151,6 +151,7 @@ public V get(Object key) {
 	}
 
 	@Override
+	@Nullable
 	public V getOrDefault(Object key, V defaultValue) {
 		if (key instanceof String) {
 			String caseInsensitiveKey = this.caseInsensitiveKeys.get(convertKey((String) key));
@@ -162,6 +163,7 @@ public V getOrDefault(Object key, V defaultValue) {
 	}
 
 	@Override
+	@Nullable
 	public V put(String key, @Nullable V value) {
 		String oldKey = this.caseInsensitiveKeys.put(convertKey(key), key);
 		if (oldKey != null && !oldKey.equals(key)) {
 
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -52,13 +52,12 @@ public class ColumnMapRowMapper implements RowMapper<Map<String, Object>> {
 	public Map<String, Object> mapRow(ResultSet rs, int rowNum) throws SQLException {
 		ResultSetMetaData rsmd = rs.getMetaData();
 		int columnCount = rsmd.getColumnCount();
-		Map<String, Object> mapOfColValues = createColumnMap(columnCount);
+		Map<String, Object> mapOfColumnValues = createColumnMap(columnCount);
 		for (int i = 1; i <= columnCount; i++) {
-			String key = getColumnKey(JdbcUtils.lookupColumnName(rsmd, i));
-			Object obj = getColumnValue(rs, i);
-			mapOfColValues.put(key, obj);
+			String column = JdbcUtils.lookupColumnName(rsmd, i);
+			mapOfColumnValues.put(getColumnKey(column), getColumnValue(rs, i));
 		}
-		return mapOfColValues;
+		return mapOfColumnValues;
 	}
 
 	/**
 
@@ -253,7 +253,6 @@ public List<Object> matchInParameterValuesWithInsertColumns(Map<String, ?> inPar
 					for (Map.Entry<String, ?> entry : inParameters.entrySet()) {
 						if (column.equalsIgnoreCase(entry.getKey())) {
 							value = entry.getValue();
-							// TODO: break;
 						}
 					}
 				}
 
@@ -37,6 +37,7 @@
 import org.springframework.jdbc.datasource.DataSourceUtils;
 import org.springframework.lang.Nullable;
 import org.springframework.util.NumberUtils;
+import org.springframework.util.StringUtils;
 
 /**
  * Generic utility methods for working with JDBC. Mainly for internal use
@@ -452,7 +453,7 @@ public static boolean isNumeric(int sqlType) {
 	 */
 	public static String lookupColumnName(ResultSetMetaData resultSetMetaData, int columnIndex) throws SQLException {
 		String name = resultSetMetaData.getColumnLabel(columnIndex);
-		if (name == null || name.length() < 1) {
+		if (!StringUtils.hasLength(name)) {
 			name = resultSetMetaData.getColumnName(columnIndex);
 		}
 		return name;
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2002-2017 the original author or authors.`
	`2`	`+ * Copyright 2002-2018 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -151,6 +151,7 @@ public V get(Object key) {`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`@Override`
	`154`	`+ @Nullable`
`154`	`155`	`public V getOrDefault(Object key, V defaultValue) {`
`155`	`156`	`if (key instanceof String) {`
`156`	`157`	`String caseInsensitiveKey = this.caseInsensitiveKeys.get(convertKey((String) key));`
`@@ -162,6 +163,7 @@ public V getOrDefault(Object key, V defaultValue) {`
`162`	`163`	`}`
`163`	`164`
`164`	`165`	`@Override`
	`166`	`+ @Nullable`
`165`	`167`	`public V put(String key, @Nullable V value) {`
`166`	`168`	`String oldKey = this.caseInsensitiveKeys.put(convertKey(key), key);`
`167`	`169`	`if (oldKey != null && !oldKey.equals(key)) {`
Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,6 @@ public List<Object> matchInParameterValuesWithInsertColumns(Map<String, ?> inPar`
`253`	`253`	`for (Map.Entry<String, ?> entry : inParameters.entrySet()) {`
`254`	`254`	`if (column.equalsIgnoreCase(entry.getKey())) {`
`255`	`255`	`value = entry.getValue();`
`256`		`- // TODO: break;`
`257`	`256`	`}`
`258`	`257`	`}`
`259`	`258`	`}`