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

Minor refactoring.

Browse Source 
Original pull request #1895
This commit is contained in:
Tran Ngoc Nhan
2024-09-23 20:23:46 +07:00
committed by Jens Schauder
parent a1f2297c20
commit dc2e14ce81
5 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/Jsr310TimestampBasedConverters.java
View File

@@ -19,15 +19,11 @@ import static java.time.LocalDateTime.*;
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;

2
spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/convert/MappingR2dbcConverter.java
View File

@@ -442,7 +442,7 @@ public class MappingR2dbcConverter extends MappingRelationalConverter implements
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;
}

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

@@ -297,8 +297,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) {
@@ -520,8 +519,7 @@ abstract class NamedParameterUtils {
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);
}

2
spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/mapping/OutboundRow.java
View File

@@ -227,6 +227,6 @@ public class OutboundRow implements Map<SqlIdentifier, Parameter>, Cloneable {
}
private static Object convertKeyIfNecessary(Object key) {
return key instanceof String ? SqlIdentifier.unquoted((String) key) : key;
return key instanceof String string ? SqlIdentifier.unquoted(string) : key;
}
}

2
spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/repository/support/ReactivePageableExecutionUtils.java
View File

@@ -60,7 +60,7 @@ abstract class ReactivePageableExecutionUtils {
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()));
}