Skip to content

Commit 94958f5

Browse files
committed
Polishing.
Code style and formatting. Original pull request #2036 See #2031
1 parent becc753 commit 94958f5

File tree

4 files changed

+8
-9
lines changed

4 files changed

+8
-9
lines changed

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/dialect/DialectResolver.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public static JdbcDialect getDialect(JdbcOperations operations) {
8585
return Stream.concat(LEGACY_DETECTORS.stream(), DETECTORS.stream()) //
8686
.map(it -> it.getDialect(operations)) //
8787
.flatMap(Optionals::toStream) //
88-
.map(it -> it instanceof JdbcDialect ? (JdbcDialect) it : new JdbcDialectAdapter(it)).findFirst() //
88+
.map(it -> it instanceof JdbcDialect jd ? jd : new JdbcDialectAdapter(it)).findFirst() //
8989
.orElseThrow(() -> new NoDialectException(
9090
String.format("Cannot determine a dialect for %s; Please provide a Dialect", operations)));
9191
}

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/AbstractJdbcConfiguration.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@ public IdGeneratingEntityCallback idGeneratingBeforeSaveCallback(JdbcMappingCont
147147
public JdbcConverter jdbcConverter(JdbcMappingContext mappingContext, NamedParameterJdbcOperations operations,
148148
@Lazy RelationResolver relationResolver, JdbcCustomConversions conversions, Dialect dialect) {
149149

150-
org.springframework.data.jdbc.core.dialect.JdbcArrayColumns arrayColumns = dialect instanceof JdbcDialect
151-
? ((JdbcDialect) dialect).getArraySupport()
150+
org.springframework.data.jdbc.core.dialect.JdbcArrayColumns arrayColumns = dialect instanceof JdbcDialect jd
151+
? jd.getArraySupport()
152152
: JdbcArrayColumns.DefaultSupport.INSTANCE;
153153
DefaultJdbcTypeFactory jdbcTypeFactory = new DefaultJdbcTypeFactory(operations.getJdbcOperations(), arrayColumns);
154154

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/DefaultDataAccessStrategyUnitTests.java

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
2727
import org.springframework.data.relational.core.conversion.IdValueSource;
2828
import org.springframework.data.relational.core.dialect.Dialect;
29-
import org.springframework.data.relational.core.dialect.HsqlDbDialect;
3029
import org.springframework.data.relational.core.mapping.RelationalMappingContext;
3130
import org.springframework.data.relational.core.sql.SqlIdentifier;
3231
import org.springframework.jdbc.core.JdbcOperations;

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/IdGeneratingEntityCallbackTest.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,10 @@
1515
*/
1616
package org.springframework.data.jdbc.core.convert;
1717

18-
import static org.assertj.core.api.Assertions.assertThat;
19-
import static org.mockito.ArgumentMatchers.anyString;
18+
import static org.assertj.core.api.Assertions.*;
19+
import static org.mockito.ArgumentMatchers.*;
20+
import static org.mockito.Mockito.*;
2021
import static org.mockito.Mockito.any;
21-
import static org.mockito.Mockito.mock;
22-
import static org.mockito.Mockito.when;
2322

2423
import java.util.UUID;
2524

@@ -56,7 +55,8 @@ class IdGeneratingEntityCallbackTest {
5655
void setUp() {
5756

5857
relationalMappingContext = new RelationalMappingContext();
59-
relationalMappingContext.setSimpleTypeHolder(new SimpleTypeHolder(JdbcPostgresDialect.INSTANCE.simpleTypes(), true));
58+
relationalMappingContext
59+
.setSimpleTypeHolder(new SimpleTypeHolder(JdbcPostgresDialect.INSTANCE.simpleTypes(), true));
6060
}
6161

6262
@Test // GH-1923

0 commit comments

Comments
 (0)