Minor refactoring.

Original pull request #1895
spring-projects · Sep 24, 2024 · dc2e14c · dc2e14c
1 parent a1f2297
commit dc2e14c
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 11 deletions.
diff --git a/.../main/java/org/springframework/data/jdbc/core/convert/Jsr310TimestampBasedConverters.java b/.../main/java/org/springframework/data/jdbc/core/convert/Jsr310TimestampBasedConverters.java
@@ -19,15 +19,11 @@
 import static java.time.ZoneId.*;
 
 import java.sql.Timestamp;
-import java.time.Duration;
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
-import java.time.Period;
-import java.time.ZoneId;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;

diff --git a/...ata-r2dbc/src/main/java/org/springframework/data/r2dbc/convert/MappingR2dbcConverter.java b/...ata-r2dbc/src/main/java/org/springframework/data/r2dbc/convert/MappingR2dbcConverter.java
@@ -442,7 +442,7 @@ public <T> BiFunction<Row, RowMetadata, T> populateIdIfNecessary(T object) {
 
 			Object id = propertyAccessor.getProperty(idProperty);
 			if (idProperty.getType().isPrimitive()) {
-				idPropertyUpdateNeeded = id instanceof Number && ((Number) id).longValue() == 0;
+				idPropertyUpdateNeeded = id instanceof Number number && number.longValue() == 0;
 			} else {
 				idPropertyUpdateNeeded = id == null;
 			}

diff --git a/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/core/NamedParameterUtils.java b/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/core/NamedParameterUtils.java
@@ -297,8 +297,7 @@ public static PreparedOperation<String> substituteNamedParameters(ParsedSql pars
 						}
 						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) {
@@ -520,8 +519,7 @@ public void bind(org.springframework.r2dbc.core.binding.BindTarget target, Strin
 
 						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);
 							}

diff --git a/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/mapping/OutboundRow.java b/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/mapping/OutboundRow.java
@@ -227,6 +227,6 @@ public void forEach(BiConsumer<? super SqlIdentifier, ? super Parameter> action)
 	}
 
 	private static Object convertKeyIfNecessary(Object key) {
-		return key instanceof String ? SqlIdentifier.unquoted((String) key) : key;
+		return key instanceof String string ? SqlIdentifier.unquoted(string) : key;
 	}
 }
diff --git a/...ava/org/springframework/data/r2dbc/repository/support/ReactivePageableExecutionUtils.java b/...ava/org/springframework/data/r2dbc/repository/support/ReactivePageableExecutionUtils.java
@@ -60,7 +60,7 @@ public static <T> Mono<Page<T>> getPage(List<T> content, Pageable pageable, Mono
 			return totalSupplier.map(total -> new PageImpl<>(content, pageable, total));
 		}
 
-		if (content.size() != 0 && pageable.getPageSize() > content.size()) {
+		if (!content.isEmpty() && pageable.getPageSize() > content.size()) {
 			return Mono.just(new PageImpl<>(content, pageable, pageable.getOffset() + content.size()));
 		}