Skip to content

Commit c491939

Browse files
ngocnhan-tran1996schauder
authored andcommitted
Minor refactoring.
Original pull request #1895
1 parent fd3d1f4 commit c491939

File tree

5 files changed

+5
-11
lines changed

5 files changed

+5
-11
lines changed

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

-4
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,11 @@
1919
import static java.time.ZoneId.*;
2020

2121
import java.sql.Timestamp;
22-
import java.time.Duration;
2322
import java.time.Instant;
2423
import java.time.LocalDate;
2524
import java.time.LocalDateTime;
2625
import java.time.LocalTime;
27-
import java.time.Period;
28-
import java.time.ZoneId;
2926
import java.util.ArrayList;
30-
import java.util.Arrays;
3127
import java.util.Collection;
3228
import java.util.Date;
3329
import java.util.List;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ public <T> BiFunction<Row, RowMetadata, T> populateIdIfNecessary(T object) {
442442

443443
Object id = propertyAccessor.getProperty(idProperty);
444444
if (idProperty.getType().isPrimitive()) {
445-
idPropertyUpdateNeeded = id instanceof Number && ((Number) id).longValue() == 0;
445+
idPropertyUpdateNeeded = id instanceof Number number && number.longValue() == 0;
446446
} else {
447447
idPropertyUpdateNeeded = id == null;
448448
}

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

+2-4
Original file line numberDiff line numberDiff line change
@@ -297,8 +297,7 @@ public static PreparedOperation<String> substituteNamedParameters(ParsedSql pars
297297
}
298298
k++;
299299
Object entryItem = entryIter.next();
300-
if (entryItem instanceof Object[]) {
301-
Object[] expressionList = (Object[]) entryItem;
300+
if (entryItem instanceof Object[] expressionList) {
302301
actualSql.append('(');
303302
for (int m = 0; m < expressionList.length; m++) {
304303
if (m > 0) {
@@ -520,8 +519,7 @@ public void bind(org.springframework.r2dbc.core.binding.BindTarget target, Strin
520519

521520
Object valueToBind = iterator.next();
522521

523-
if (valueToBind instanceof Object[]) {
524-
Object[] objects = (Object[]) valueToBind;
522+
if (valueToBind instanceof Object[] objects) {
525523
for (Object object : objects) {
526524
bind(target, markers, object);
527525
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,6 @@ public void forEach(BiConsumer<? super SqlIdentifier, ? super Parameter> action)
227227
}
228228

229229
private static Object convertKeyIfNecessary(Object key) {
230-
return key instanceof String ? SqlIdentifier.unquoted((String) key) : key;
230+
return key instanceof String string ? SqlIdentifier.unquoted(string) : key;
231231
}
232232
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public static <T> Mono<Page<T>> getPage(List<T> content, Pageable pageable, Mono
6060
return totalSupplier.map(total -> new PageImpl<>(content, pageable, total));
6161
}
6262

63-
if (content.size() != 0 && pageable.getPageSize() > content.size()) {
63+
if (!content.isEmpty() && pageable.getPageSize() > content.size()) {
6464
return Mono.just(new PageImpl<>(content, pageable, pageable.getOffset() + content.size()));
6565
}
6666

0 commit comments

Comments
 (0)