Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Apply "instanceof pattern matching" in spring-r2dbc

Browse Source
This commit is contained in:
Sam Brannen
2022-02-02 16:03:12 +01:00
parent 12342d7f8e
commit 9a5ecd0c46
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-r2dbc/src/main/java/org/springframework/r2dbc/core/NamedParameterUtils.java
View File

@@ -303,8 +303,7 @@ abstract class NamedParameterUtils {
}
k++;
Object entryItem = entryIter.next();
if (entryItem instanceof Object[]) {
Object[] expressionList = (Object[]) entryItem;
if (entryItem instanceof Object[] expressionList) {
actualSql.append('(');
for (int m = 0; m < expressionList.length; m++) {
if (m > 0) {
@@ -397,10 +396,9 @@ abstract class NamedParameterUtils {
if (this == o) {
return true;
}
if (!(o instanceof ParameterHolder)) {
if (!(o instanceof ParameterHolder that)) {
return false;
}
ParameterHolder that = (ParameterHolder) o;
return this.startIndex == that.startIndex && this.endIndex == that.endIndex
&& Objects.equals(this.parameterName, that.parameterName);
}
@@ -522,8 +520,7 @@ abstract class NamedParameterUtils {
Iterator<BindMarker> markers = bindMarkers.iterator();
while (iterator.hasNext()) {
Object valueToBind = iterator.next();
if (valueToBind instanceof Object[]) {
Object[] objects = (Object[]) valueToBind;
if (valueToBind instanceof Object[] objects) {
for (Object object : objects) {
bind(target, markers, object);
}

3
spring-r2dbc/src/main/java/org/springframework/r2dbc/core/Parameter.java
View File

@@ -113,10 +113,9 @@ public final class Parameter {
if (this == obj) {
return true;
}
if (!(obj instanceof Parameter)) {
if (!(obj instanceof Parameter other)) {
return false;
}
Parameter other = (Parameter) obj;
return (ObjectUtils.nullSafeEquals(this.value, other.value) &&
ObjectUtils.nullSafeEquals(this.type, other.type));
}