From 727b14be37c07966f28b98631a6f4870ce154d30 Mon Sep 17 00:00:00 2001 From: "a.yazychyan" Date: Fri, 17 Dec 2021 01:27:02 +0300 Subject: [PATCH] Use new java version features --- .../jdbc/core/ArgumentTypePreparedStatementSetter.java | 3 +-- .../jdbc/core/PreparedStatementCreatorFactory.java | 3 +-- .../incrementer/AbstractDataFieldMaxValueIncrementer.java | 7 +------ 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ArgumentTypePreparedStatementSetter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ArgumentTypePreparedStatementSetter.java index 3d89d8abe775..8b68d529e413 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ArgumentTypePreparedStatementSetter.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ArgumentTypePreparedStatementSetter.java @@ -61,8 +61,7 @@ public void setValues(PreparedStatement ps) throws SQLException { if (this.args != null && this.argTypes != null) { for (int i = 0; i < this.args.length; i++) { Object arg = this.args[i]; - if (arg instanceof Collection && this.argTypes[i] != Types.ARRAY) { - Collection entries = (Collection) arg; + if (arg instanceof Collection entries && this.argTypes[i] != Types.ARRAY) { for (Object entry : entries) { if (entry instanceof Object[] valueArray) { for (Object argValue : valueArray) { diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCreatorFactory.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCreatorFactory.java index ecf784e4c63e..b40703dad045 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCreatorFactory.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCreatorFactory.java @@ -265,8 +265,7 @@ public void setValues(PreparedStatement ps) throws SQLException { } declaredParameter = declaredParameters.get(i); } - if (in instanceof Iterable && declaredParameter.getSqlType() != Types.ARRAY) { - Iterable entries = (Iterable) in; + if (in instanceof Iterable entries && declaredParameter.getSqlType() != Types.ARRAY) { for (Object entry : entries) { if (entry instanceof Object[] valueArray) { for (Object argValue : valueArray) { diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractDataFieldMaxValueIncrementer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractDataFieldMaxValueIncrementer.java index bc96bcf95ab8..2dee01f87286 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractDataFieldMaxValueIncrementer.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractDataFieldMaxValueIncrementer.java @@ -133,12 +133,7 @@ public String nextStringValue() throws DataAccessException { String s = Long.toString(getNextKey()); int len = s.length(); if (len < this.paddingLength) { - StringBuilder sb = new StringBuilder(this.paddingLength); - for (int i = 0; i < this.paddingLength - len; i++) { - sb.append('0'); - } - sb.append(s); - s = sb.toString(); + s = "0".repeat(this.paddingLength - len) + s; } return s; }