Commit 8e9043f

committed

Polishing.

Code style and formatting. Original pull request #2036 See #2031

1 parent cbbc0a0 commit 8e9043fCopy full SHA for 8e9043f

File tree

-9

lines changed

-9

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public static JdbcDialect getDialect(JdbcOperations operations) {`
`85`	`85`	`return Stream.concat(LEGACY_DETECTORS.stream(), DETECTORS.stream()) //`
`86`	`86`	`.map(it -> it.getDialect(operations)) //`
`87`	`87`	`.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() //`
`89`	`89`	`.orElseThrow(() -> new NoDialectException(`
`90`	`90`	`String.format("Cannot determine a dialect for %s; Please provide a Dialect", operations)));`
`91`	`91`	`}`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -147,8 +147,8 @@ public IdGeneratingEntityCallback idGeneratingBeforeSaveCallback(JdbcMappingCont`
`147`	`147`	`public JdbcConverter jdbcConverter(JdbcMappingContext mappingContext, NamedParameterJdbcOperations operations,`
`148`	`148`	`@Lazy RelationResolver relationResolver, JdbcCustomConversions conversions, Dialect dialect) {`
`149`	`149`
`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 JdbcDialectjd`
	`151`	`+ ? jd.getArraySupport()`
`152`	`152`	`: JdbcArrayColumns.DefaultSupport.INSTANCE;`
`153`	`153`	`DefaultJdbcTypeFactory jdbcTypeFactory = new DefaultJdbcTypeFactory(operations.getJdbcOperations(), arrayColumns);`
`154`	`154`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@`
`26`	`26`	`import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;`
`27`	`27`	`import org.springframework.data.relational.core.conversion.IdValueSource;`
`28`	`28`	`import org.springframework.data.relational.core.dialect.Dialect;`
`29`		`-import org.springframework.data.relational.core.dialect.HsqlDbDialect;`
`30`	`29`	`import org.springframework.data.relational.core.mapping.RelationalMappingContext;`
`31`	`30`	`import org.springframework.data.relational.core.sql.SqlIdentifier;`
`32`	`31`	`import org.springframework.jdbc.core.JdbcOperations;`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,11 +15,10 @@`
`15`	`15`	`*/`
`16`	`16`	`package org.springframework.data.jdbc.core.convert;`
`17`	`17`
`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.*;`
`20`	`21`	`import static org.mockito.Mockito.any;`
`21`		`-import static org.mockito.Mockito.mock;`
`22`		`-import static org.mockito.Mockito.when;`
`23`	`22`
`24`	`23`	`import java.util.UUID;`
`25`	`24`
`@@ -56,7 +55,8 @@ class IdGeneratingEntityCallbackTest {`
`56`	`55`	`void setUp() {`
`57`	`56`
`58`	`57`	`relationalMappingContext = new RelationalMappingContext();`
`59`		`- relationalMappingContext.setSimpleTypeHolder(new SimpleTypeHolder(JdbcPostgresDialect.INSTANCE.simpleTypes(), true));`
	`58`	`+ relationalMappingContext`
	`59`	`+ .setSimpleTypeHolder(new SimpleTypeHolder(JdbcPostgresDialect.INSTANCE.simpleTypes(), true));`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`@Test // GH-1923`

Comments

(0)