root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Apply "instanceof pattern matching" in remainder of spring-jdbc module 

See gh-30067
This commit is contained in:
Sam Brannen 2023-03-06 15:18:05 +01:00
parent 8175a3bf09
commit 7f1b81ff53
3 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
spring-jdbc/src/main/java/org/springframework/jdbc/core/StatementCreatorUtils.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 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.
@ -293,11 +293,11 @@ public abstract class StatementCreatorUtils {
private static void setValue(PreparedStatement ps, int paramIndex, int sqlType,
@Nullable String typeName, @Nullable Integer scale, Object inValue) throws SQLException {
if (inValue instanceof SqlTypeValue) {
((SqlTypeValue) inValue).setTypeValue(ps, paramIndex, sqlType, typeName);
if (inValue instanceof SqlTypeValue sqlTypeValue) {
sqlTypeValue.setTypeValue(ps, paramIndex, sqlType, typeName);
}
else if (inValue instanceof SqlValue) {
((SqlValue) inValue).setValue(ps, paramIndex);
else if (inValue instanceof SqlValue sqlValue) {
sqlValue.setValue(ps, paramIndex);
}
else if (sqlType == Types.VARCHAR || sqlType == Types.LONGVARCHAR ) {
ps.setString(paramIndex, inValue.toString());
@ -328,8 +328,8 @@ public abstract class StatementCreatorUtils {
}
}
else if (sqlType == Types.DECIMAL || sqlType == Types.NUMERIC) {
if (inValue instanceof BigDecimal) {
ps.setBigDecimal(paramIndex, (BigDecimal) inValue);
if (inValue instanceof BigDecimal bigDecimal) {
ps.setBigDecimal(paramIndex, bigDecimal);
}
else if (scale != null) {
ps.setObject(paramIndex, inValue, sqlType, scale);
@ -339,20 +339,20 @@ public abstract class StatementCreatorUtils {
}
}
else if (sqlType == Types.BOOLEAN) {
if (inValue instanceof Boolean) {
ps.setBoolean(paramIndex, (Boolean) inValue);
if (inValue instanceof Boolean flag) {
ps.setBoolean(paramIndex, flag);
}
else {
ps.setObject(paramIndex, inValue, Types.BOOLEAN);
}
}
else if (sqlType == Types.DATE) {
if (inValue instanceof java.util.Date) {
if (inValue instanceof java.sql.Date) {
ps.setDate(paramIndex, (java.sql.Date) inValue);
if (inValue instanceof java.util.Date date) {
if (inValue instanceof java.sql.Date sqlDate) {
ps.setDate(paramIndex, sqlDate);
}
else {
ps.setDate(paramIndex, new java.sql.Date(((java.util.Date) inValue).getTime()));
ps.setDate(paramIndex, new java.sql.Date(date.getTime()));
}
}
else if (inValue instanceof Calendar cal) {
@ -363,12 +363,12 @@ public abstract class StatementCreatorUtils {
}
}
else if (sqlType == Types.TIME) {
if (inValue instanceof java.util.Date) {
if (inValue instanceof java.sql.Time) {
ps.setTime(paramIndex, (java.sql.Time) inValue);
if (inValue instanceof java.util.Date date) {
if (inValue instanceof java.sql.Time time) {
ps.setTime(paramIndex, time);
}
else {
ps.setTime(paramIndex, new java.sql.Time(((java.util.Date) inValue).getTime()));
ps.setTime(paramIndex, new java.sql.Time(date.getTime()));
}
}
else if (inValue instanceof Calendar cal) {
@ -379,12 +379,12 @@ public abstract class StatementCreatorUtils {
}
}
else if (sqlType == Types.TIMESTAMP) {
if (inValue instanceof java.util.Date) {
if (inValue instanceof java.sql.Timestamp) {
ps.setTimestamp(paramIndex, (java.sql.Timestamp) inValue);
if (inValue instanceof java.util.Date date) {
if (inValue instanceof java.sql.Timestamp timestamp) {
ps.setTimestamp(paramIndex, timestamp);
}
else {
ps.setTimestamp(paramIndex, new java.sql.Timestamp(((java.util.Date) inValue).getTime()));
ps.setTimestamp(paramIndex, new java.sql.Timestamp(date.getTime()));
}
}
else if (inValue instanceof Calendar cal) {
@ -460,15 +460,15 @@ public abstract class StatementCreatorUtils {
if (paramValues != null) {
for (Object inValue : paramValues) {
// Unwrap SqlParameterValue first...
if (inValue instanceof SqlParameterValue) {
inValue = ((SqlParameterValue) inValue).getValue();
if (inValue instanceof SqlParameterValue sqlParameterValue) {
inValue = sqlParameterValue.getValue();
}
// Check for disposable value types
if (inValue instanceof SqlValue) {
((SqlValue) inValue).cleanup();
if (inValue instanceof SqlValue sqlValue) {
sqlValue.cleanup();
}
else if (inValue instanceof DisposableSqlTypeValue) {
((DisposableSqlTypeValue) inValue).cleanup();
else if (inValue instanceof DisposableSqlTypeValue disposableSqlTypeValue) {
disposableSqlTypeValue.cleanup();
}
}
}

10
spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/MapSqlParameterSource.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2023 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.
@ -87,8 +87,8 @@ public class MapSqlParameterSource extends AbstractSqlParameterSource {
public MapSqlParameterSource addValue(String paramName, @Nullable Object value) {
Assert.notNull(paramName, "Parameter name must not be null");
this.values.put(paramName, value);
if (value instanceof SqlParameterValue) {
registerSqlType(paramName, ((SqlParameterValue) value).getSqlType());
if (value instanceof SqlParameterValue sqlParameterValue) {
registerSqlType(paramName, sqlParameterValue.getSqlType());
}
return this;
}
@ -135,8 +135,8 @@ public class MapSqlParameterSource extends AbstractSqlParameterSource {
if (values != null) {
values.forEach((key, value) -> {
this.values.put(key, value);
if (value instanceof SqlParameterValue) {
registerSqlType(key, ((SqlParameterValue) value).getSqlType());
if (value instanceof SqlParameterValue sqlParameterValue) {
registerSqlType(key, sqlParameterValue.getSqlType());
}
});
}

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

@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 the original author or authors.
* Copyright 2002-2023 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.
@ -59,12 +59,12 @@ public abstract class SqlParameterSourceUtils {
* @see BeanPropertySqlParameterSource
* @see NamedParameterJdbcTemplate#batchUpdate(String, SqlParameterSource[])
*/
@SuppressWarnings("unchecked")
@SuppressWarnings({ "unchecked", "rawtypes" })
public static SqlParameterSource[] createBatch(Collection<?> candidates) {
SqlParameterSource[] batch = new SqlParameterSource[candidates.size()];
int i = 0;
for (Object candidate : candidates) {
batch[i] = (candidate instanceof Map ? new MapSqlParameterSource((Map<String, ?>) candidate) :
batch[i] = (candidate instanceof Map map ? new MapSqlParameterSource(map) :
new BeanPropertySqlParameterSource(candidate));
i++;
}