Browse Source

Minor refactoring.

Original pull request #1895
3.2.x
Tran Ngoc Nhan 1 year ago committed by Jens Schauder
parent
commit
c4919396af
No known key found for this signature in database
GPG Key ID: 74F6C554AE971567
  1. 4
      spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/Jsr310TimestampBasedConverters.java
  2. 2
      spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/convert/MappingR2dbcConverter.java
  3. 6
      spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/core/NamedParameterUtils.java
  4. 2
      spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/mapping/OutboundRow.java
  5. 2
      spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/repository/support/ReactivePageableExecutionUtils.java

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

@ -19,15 +19,11 @@ import static java.time.LocalDateTime.*;
import static java.time.ZoneId.*; import static java.time.ZoneId.*;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.time.Duration;
import java.time.Instant; import java.time.Instant;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.LocalTime; import java.time.LocalTime;
import java.time.Period;
import java.time.ZoneId;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;

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

@ -442,7 +442,7 @@ public class MappingR2dbcConverter extends MappingRelationalConverter implements
Object id = propertyAccessor.getProperty(idProperty); Object id = propertyAccessor.getProperty(idProperty);
if (idProperty.getType().isPrimitive()) { if (idProperty.getType().isPrimitive()) {
idPropertyUpdateNeeded = id instanceof Number && ((Number) id).longValue() == 0; idPropertyUpdateNeeded = id instanceof Number number && number.longValue() == 0;
} else { } else {
idPropertyUpdateNeeded = id == null; idPropertyUpdateNeeded = id == null;
} }

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

@ -297,8 +297,7 @@ abstract class NamedParameterUtils {
} }
k++; k++;
Object entryItem = entryIter.next(); Object entryItem = entryIter.next();
if (entryItem instanceof Object[]) { if (entryItem instanceof Object[] expressionList) {
Object[] expressionList = (Object[]) entryItem;
actualSql.append('('); actualSql.append('(');
for (int m = 0; m < expressionList.length; m++) { for (int m = 0; m < expressionList.length; m++) {
if (m > 0) { if (m > 0) {
@ -520,8 +519,7 @@ abstract class NamedParameterUtils {
Object valueToBind = iterator.next(); Object valueToBind = iterator.next();
if (valueToBind instanceof Object[]) { if (valueToBind instanceof Object[] objects) {
Object[] objects = (Object[]) valueToBind;
for (Object object : objects) { for (Object object : objects) {
bind(target, markers, object); bind(target, markers, object);
} }

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

@ -227,6 +227,6 @@ public class OutboundRow implements Map<SqlIdentifier, Parameter>, Cloneable {
} }
private static Object convertKeyIfNecessary(Object key) { 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

@ -60,7 +60,7 @@ abstract class ReactivePageableExecutionUtils {
return totalSupplier.map(total -> new PageImpl<>(content, pageable, total)); 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())); return Mono.just(new PageImpl<>(content, pageable, pageable.getOffset() + content.size()));
} }

Loading…
Cancel
Save