From dd7362516b4a6de60c87b739374e05448209c158 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 11 Oct 2018 16:14:43 +0200 Subject: [PATCH] DATAJDBC-272 - Reformat code and optimize imports. --- .../data/jdbc/core/SelectBuilder.java | 2 +- .../data/jdbc/core/SqlGeneratorSource.java | 4 +-- .../jdbc/core/mapping/AggregateReference.java | 7 ++-- .../data/jdbc/core/package-info.java | 2 +- .../data/jdbc/mybatis/MyBatisContext.java | 3 +- .../mybatis/MyBatisDataAccessStrategy.java | 3 +- .../config/EnableJdbcRepositories.java | 3 +- .../repository/config/JdbcConfiguration.java | 4 +-- .../data/jdbc/repository/query/Query.java | 7 ++-- .../support/JdbcRepositoryQuery.java | 4 +-- .../AggregateTemplateIntegrationTests.java | 3 +- .../CascadingDataAccessStrategyUnitTests.java | 10 +++--- .../jdbc/core/EntityRowMapperUnitTests.java | 2 +- .../MyBatisDataAccessStrategyUnitTests.java | 24 ++++++------- ...GeneratorFixedNamingStrategyUnitTests.java | 18 +++++----- .../data/jdbc/core/SqlGeneratorUnitTests.java | 7 ++-- ...lConverterAggregateReferenceUnitTests.java | 3 +- .../BasicJdbcPersistentPropertyUnitTests.java | 4 +-- .../data/jdbc/mybatis/DummyEntity.java | 3 +- .../mybatis/MyBatisHsqlIntegrationTests.java | 3 +- ...ryManipulateDbActionsIntegrationTests.java | 6 ++-- ...anuallyAssignedIdHsqlIntegrationTests.java | 5 +-- ...sitoryWithCollectionsIntegrationTests.java | 5 +-- ...bcRepositoryWithListsIntegrationTests.java | 24 +++++-------- ...dbcRepositoryWithMapsIntegrationTests.java | 2 +- .../SimpleJdbcRepositoryEventsUnitTests.java | 15 ++++---- ...nableJdbcAuditingHsqlIntegrationTests.java | 6 ++-- ...nableJdbcRepositoriesIntegrationTests.java | 3 +- .../QueryAnnotationHsqlIntegrationTests.java | 1 - .../MariaDBDataSourceConfiguration.java | 8 ++--- .../testing/MySqlDataSourceConfiguration.java | 5 ++- .../PostgresDataSourceConfiguration.java | 4 +-- .../relational/core/conversion/DbAction.java | 4 +-- .../core/conversion/RelationalConverter.java | 3 +- .../conversion/RelationalEntityWriter.java | 13 ++++--- .../core/mapping/NamingStrategy.java | 4 +-- .../mapping/RelationalPersistentProperty.java | 3 +- .../core/mapping/event/WithEntity.java | 4 +-- .../relational/core/mapping/event/WithId.java | 4 +-- .../DbActionExecutionExceptionTest.java | 2 -- ...RelationalEntityDeleteWriterUnitTests.java | 6 ++-- .../RelationalEntityWriterUnitTests.java | 34 +++++++++++-------- .../core/mapping/NamingStrategyUnitTests.java | 3 -- .../RelationalMappingContextUnitTests.java | 7 ++-- ...lationalPersistentEntityImplUnitTests.java | 4 --- .../core/mapping/event/IdentifierTest.java | 11 +++--- 46 files changed, 130 insertions(+), 172 deletions(-) diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/SelectBuilder.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/SelectBuilder.java index e7583e63..f1e572c4 100644 --- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/SelectBuilder.java +++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/SelectBuilder.java @@ -103,7 +103,7 @@ class SelectBuilder { return conditions.stream() // .map(WhereCondition::toSql) // .collect(Collectors.joining("AND", " WHERE ", "") // - ); + ); } private String joinClause() { diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/SqlGeneratorSource.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/SqlGeneratorSource.java index f83097d7..37aade5a 100644 --- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/SqlGeneratorSource.java +++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/SqlGeneratorSource.java @@ -23,8 +23,8 @@ import java.util.Map; import org.springframework.data.relational.core.mapping.RelationalMappingContext; /** - * Provides {@link SqlGenerator}s per domain type. Instances get cached, so when asked multiple times for the same domain - * type, the same generator will get returned. + * Provides {@link SqlGenerator}s per domain type. Instances get cached, so when asked multiple times for the same + * domain type, the same generator will get returned. * * @author Jens Schauder */ diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/mapping/AggregateReference.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/mapping/AggregateReference.java index 620d66c9..2c905048 100644 --- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/mapping/AggregateReference.java +++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/mapping/AggregateReference.java @@ -24,9 +24,7 @@ import org.springframework.lang.Nullable; * * @param the type of the referenced aggregate root. * @param the type of the id of the referenced aggregate root. - * * @author Jens Schauder - * * @since 1.0 */ public interface AggregateReference { @@ -42,9 +40,8 @@ public interface AggregateReference { ID getId(); /** - * An {@link AggregateReference} that only holds the id of the referenced aggregate root. - * - * Note that there is no check that a matching aggregate for this id actually exists. + * An {@link AggregateReference} that only holds the id of the referenced aggregate root. Note that there is no check + * that a matching aggregate for this id actually exists. * * @param * @param diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/package-info.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/package-info.java index 5be2bd7c..303b86c7 100644 --- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/package-info.java +++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/package-info.java @@ -4,4 +4,4 @@ @NonNullApi package org.springframework.data.jdbc.core; -import org.springframework.lang.NonNullApi; \ No newline at end of file +import org.springframework.lang.NonNullApi; diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/mybatis/MyBatisContext.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/mybatis/MyBatisContext.java index 7a9e0424..861e46bd 100644 --- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/mybatis/MyBatisContext.java +++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/mybatis/MyBatisContext.java @@ -33,7 +33,8 @@ public class MyBatisContext { private final Class domainType; private final Map additonalValues; - public MyBatisContext(@Nullable Object id, @Nullable Object instance, Class domainType, Map additonalValues) { + public MyBatisContext(@Nullable Object id, @Nullable Object instance, Class domainType, + Map additonalValues) { this.id = id; this.instance = instance; diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/mybatis/MyBatisDataAccessStrategy.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/mybatis/MyBatisDataAccessStrategy.java index 2a6109a2..db55d20f 100644 --- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/mybatis/MyBatisDataAccessStrategy.java +++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/mybatis/MyBatisDataAccessStrategy.java @@ -131,8 +131,7 @@ public class MyBatisDataAccessStrategy implements DataAccessStrategy { public Object insert(T instance, Class domainType, Map additionalParameters) { MyBatisContext myBatisContext = new MyBatisContext(null, instance, domainType, additionalParameters); - sqlSession().insert(namespace(domainType) + ".insert", - myBatisContext); + sqlSession().insert(namespace(domainType) + ".insert", myBatisContext); return myBatisContext.getId(); } diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/EnableJdbcRepositories.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/EnableJdbcRepositories.java index 1fac8e17..36adbf58 100644 --- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/EnableJdbcRepositories.java +++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/EnableJdbcRepositories.java @@ -45,7 +45,8 @@ public @interface EnableJdbcRepositories { /** * Alias for the {@link #basePackages()} attribute. Allows for more concise annotation declarations e.g.: - * {@code @EnableJdbcRepositories("org.my.pkg")} instead of {@code @EnableJdbcRepositories(basePackages="org.my.pkg")}. + * {@code @EnableJdbcRepositories("org.my.pkg")} instead of + * {@code @EnableJdbcRepositories(basePackages="org.my.pkg")}. */ String[] value() default {}; diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/JdbcConfiguration.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/JdbcConfiguration.java index fdd5771f..334bd2af 100644 --- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/JdbcConfiguration.java +++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/JdbcConfiguration.java @@ -23,7 +23,6 @@ import org.springframework.core.convert.converter.Converter; import org.springframework.data.jdbc.core.convert.BasicJdbcConverter; import org.springframework.data.jdbc.core.convert.JdbcCustomConversions; import org.springframework.data.jdbc.core.mapping.JdbcMappingContext; -import org.springframework.data.relational.core.conversion.BasicRelationalConverter; import org.springframework.data.relational.core.conversion.RelationalConverter; import org.springframework.data.relational.core.mapping.NamingStrategy; import org.springframework.data.relational.core.mapping.RelationalMappingContext; @@ -49,8 +48,7 @@ public class JdbcConfiguration { @Bean protected JdbcMappingContext jdbcMappingContext(Optional namingStrategy) { - JdbcMappingContext mappingContext = new JdbcMappingContext( - namingStrategy.orElse(NamingStrategy.INSTANCE)); + JdbcMappingContext mappingContext = new JdbcMappingContext(namingStrategy.orElse(NamingStrategy.INSTANCE)); mappingContext.setSimpleTypeHolder(jdbcCustomConversions().getSimpleTypeHolder()); return mappingContext; diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/query/Query.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/query/Query.java index c8c74294..ce9c3731 100644 --- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/query/Query.java +++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/query/Query.java @@ -25,10 +25,9 @@ import org.springframework.data.annotation.QueryAnnotation; import org.springframework.jdbc.core.RowMapper; /** - * Annotation to provide SQL statements that will get used for executing the method. - * - * The SQL statement may contain named parameters as supported by {@link org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate}. - * Those parameters will get bound to the arguments of the annotated method. + * Annotation to provide SQL statements that will get used for executing the method. The SQL statement may contain named + * parameters as supported by {@link org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate}. Those + * parameters will get bound to the arguments of the annotated method. * * @author Jens Schauder */ diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryQuery.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryQuery.java index d85735c6..ec36e9a9 100644 --- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryQuery.java +++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryQuery.java @@ -52,8 +52,8 @@ class JdbcRepositoryQuery implements RepositoryQuery { private final RowMapper rowMapper; /** - * Creates a new {@link JdbcRepositoryQuery} for the given {@link JdbcQueryMethod}, {@link RelationalMappingContext} and - * {@link RowMapper}. + * Creates a new {@link JdbcRepositoryQuery} for the given {@link JdbcQueryMethod}, {@link RelationalMappingContext} + * and {@link RowMapper}. * * @param publisher must not be {@literal null}. * @param context must not be {@literal null}. diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/AggregateTemplateIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/AggregateTemplateIntegrationTests.java index 7c2196b7..542d4c8c 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/AggregateTemplateIntegrationTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/AggregateTemplateIntegrationTests.java @@ -310,8 +310,7 @@ public class AggregateTemplateIntegrationTests { private String name; private Manual manual; - @Column("alternative") - private Manual alternativeInstructions; + @Column("alternative") private Manual alternativeInstructions; } @Data diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/CascadingDataAccessStrategyUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/CascadingDataAccessStrategyUnitTests.java index 5c56a960..4a7c18e2 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/CascadingDataAccessStrategyUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/CascadingDataAccessStrategyUnitTests.java @@ -35,11 +35,11 @@ import org.springframework.data.relational.core.mapping.RelationalPersistentProp public class CascadingDataAccessStrategyUnitTests { int errorIndex = 1; - String[] errorMessages = {"Sorry I don't support this method. Please try again later", "Still no luck"}; + String[] errorMessages = { "Sorry I don't support this method. Please try again later", "Still no luck" }; DataAccessStrategy alwaysFails = mock(DataAccessStrategy.class, i -> { - errorIndex ++; - errorIndex %=2; + errorIndex++; + errorIndex %= 2; throw new UnsupportedOperationException(errorMessages[errorIndex]); }); DataAccessStrategy succeeds = mock(DataAccessStrategy.class); @@ -47,7 +47,6 @@ public class CascadingDataAccessStrategyUnitTests { throw new AssertionFailedError("this shouldn't have get called"); }); - @Test // DATAJDBC-123 public void findByReturnsFirstSuccess() { @@ -75,7 +74,8 @@ public class CascadingDataAccessStrategyUnitTests { @Test // DATAJDBC-123 public void findByPropertyReturnsFirstSuccess() { - doReturn(Collections.singletonList("success")).when(succeeds).findAllByProperty(eq(23L), any(RelationalPersistentProperty.class)); + doReturn(Collections.singletonList("success")).when(succeeds).findAllByProperty(eq(23L), + any(RelationalPersistentProperty.class)); CascadingDataAccessStrategy access = new CascadingDataAccessStrategy(asList(alwaysFails, succeeds, mayNotCall)); Iterable findAll = access.findAllByProperty(23L, mock(RelationalPersistentProperty.class)); diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/EntityRowMapperUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/EntityRowMapperUnitTests.java index 201506db..e728f4bd 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/EntityRowMapperUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/EntityRowMapperUnitTests.java @@ -247,7 +247,7 @@ public class EntityRowMapperUnitTests { "Number of values [%d] must be a multiple of the number of columns [%d]", // values.length, // columns.size() // - ) // + ) // ); List> result = convertValues(columns, values); diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/MyBatisDataAccessStrategyUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/MyBatisDataAccessStrategyUnitTests.java index 3248b8a0..228cdb4a 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/MyBatisDataAccessStrategyUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/MyBatisDataAccessStrategyUnitTests.java @@ -78,7 +78,7 @@ public class MyBatisDataAccessStrategyUnitTests { null, // String.class, // "value" // - ); + ); } @Test // DATAJDBC-123 @@ -100,7 +100,7 @@ public class MyBatisDataAccessStrategyUnitTests { null, // String.class, // null // - ); + ); } @Test // DATAJDBC-123 @@ -122,7 +122,7 @@ public class MyBatisDataAccessStrategyUnitTests { "an-id", // String.class, // null // - ); + ); } @Test // DATAJDBC-123 @@ -146,7 +146,7 @@ public class MyBatisDataAccessStrategyUnitTests { null, // ChildTwo.class, // null // - ); + ); } @Test // DATAJDBC-123 @@ -168,7 +168,7 @@ public class MyBatisDataAccessStrategyUnitTests { null, // String.class, // null // - ); + ); } @Test // DATAJDBC-123 @@ -191,7 +191,7 @@ public class MyBatisDataAccessStrategyUnitTests { null, "rootid", // ChildTwo.class, // null // - ); + ); } @Test // DATAJDBC-123 @@ -212,7 +212,7 @@ public class MyBatisDataAccessStrategyUnitTests { null, "an-id", // String.class, // null // - ); + ); } @Test // DATAJDBC-123 @@ -234,7 +234,7 @@ public class MyBatisDataAccessStrategyUnitTests { null, // String.class, // null // - ); + ); } @Test // DATAJDBC-123 @@ -256,7 +256,7 @@ public class MyBatisDataAccessStrategyUnitTests { asList("id1", "id2"), // String.class, // null // - ); + ); } @SuppressWarnings("unchecked") @@ -285,7 +285,7 @@ public class MyBatisDataAccessStrategyUnitTests { "id", // Number.class, // null // - ); + ); } @Test // DATAJDBC-123 @@ -307,7 +307,7 @@ public class MyBatisDataAccessStrategyUnitTests { "id", // String.class, // null // - ); + ); } @Test // DATAJDBC-157 @@ -331,7 +331,7 @@ public class MyBatisDataAccessStrategyUnitTests { null, // String.class, // null // - ); + ); } private static class DummyEntity { diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorFixedNamingStrategyUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorFixedNamingStrategyUnitTests.java index 7a8105d5..2bac4738 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorFixedNamingStrategyUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorFixedNamingStrategyUnitTests.java @@ -114,8 +114,8 @@ public class SqlGeneratorFixedNamingStrategyUnitTests { String sql = sqlGenerator.createDeleteByPath(getPath("ref", DummyEntity.class)); - assertThat(sql).isEqualTo("DELETE FROM FixedCustomSchema.FixedCustomTablePrefix_ReferencedEntity " - + "WHERE dummy_entity = :rootId"); + assertThat(sql).isEqualTo( + "DELETE FROM FixedCustomSchema.FixedCustomTablePrefix_ReferencedEntity " + "WHERE dummy_entity = :rootId"); } @Test // DATAJDBC-107 @@ -126,9 +126,8 @@ public class SqlGeneratorFixedNamingStrategyUnitTests { String sql = sqlGenerator.createDeleteByPath(getPath("ref.further", DummyEntity.class)); assertThat(sql).isEqualTo("DELETE FROM FixedCustomSchema.FixedCustomTablePrefix_SecondLevelReferencedEntity " - + "WHERE referenced_entity IN " - + "(SELECT FixedCustomPropertyPrefix_l1id " + "FROM FixedCustomSchema.FixedCustomTablePrefix_ReferencedEntity " - + "WHERE dummy_entity = :rootId)"); + + "WHERE referenced_entity IN " + "(SELECT FixedCustomPropertyPrefix_l1id " + + "FROM FixedCustomSchema.FixedCustomTablePrefix_ReferencedEntity " + "WHERE dummy_entity = :rootId)"); } @Test // DATAJDBC-107 @@ -148,8 +147,8 @@ public class SqlGeneratorFixedNamingStrategyUnitTests { String sql = sqlGenerator.createDeleteAllSql(getPath("ref", DummyEntity.class)); - assertThat(sql).isEqualTo("DELETE FROM FixedCustomSchema.FixedCustomTablePrefix_ReferencedEntity " - + "WHERE dummy_entity IS NOT NULL"); + assertThat(sql).isEqualTo( + "DELETE FROM FixedCustomSchema.FixedCustomTablePrefix_ReferencedEntity " + "WHERE dummy_entity IS NOT NULL"); } @Test // DATAJDBC-107 @@ -160,9 +159,8 @@ public class SqlGeneratorFixedNamingStrategyUnitTests { String sql = sqlGenerator.createDeleteAllSql(getPath("ref.further", DummyEntity.class)); assertThat(sql).isEqualTo("DELETE FROM FixedCustomSchema.FixedCustomTablePrefix_SecondLevelReferencedEntity " - + "WHERE referenced_entity IN " - + "(SELECT FixedCustomPropertyPrefix_l1id " + "FROM FixedCustomSchema.FixedCustomTablePrefix_ReferencedEntity " - + "WHERE dummy_entity IS NOT NULL)"); + + "WHERE referenced_entity IN " + "(SELECT FixedCustomPropertyPrefix_l1id " + + "FROM FixedCustomSchema.FixedCustomTablePrefix_ReferencedEntity " + "WHERE dummy_entity IS NOT NULL)"); } @Test // DATAJDBC-113 diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorUnitTests.java index 97d97827..fbc0ae11 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorUnitTests.java @@ -199,9 +199,7 @@ public class SqlGeneratorUnitTests { String findAll = sqlGenerator.getFindAll(); - assertThat(findAll).containsSequence( - "SELECT", - "child.parent_of_no_id_child AS child_parent_of_no_id_child", + assertThat(findAll).containsSequence("SELECT", "child.parent_of_no_id_child AS child_parent_of_no_id_child", "FROM"); } @@ -256,8 +254,7 @@ public class SqlGeneratorUnitTests { NoIdChild child; } - static class NoIdChild { - } + static class NoIdChild {} static class OtherAggregate { @Id Long id; diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/BasicRelationalConverterAggregateReferenceUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/BasicRelationalConverterAggregateReferenceUnitTests.java index 572d9e5c..21444284 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/BasicRelationalConverterAggregateReferenceUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/BasicRelationalConverterAggregateReferenceUnitTests.java @@ -72,8 +72,7 @@ public class BasicRelationalConverterAggregateReferenceUnitTests { private static class DummyEntity { - @Id - Long simple; + @Id Long simple; AggregateReference reference; } } diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/mapping/BasicJdbcPersistentPropertyUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/mapping/BasicJdbcPersistentPropertyUnitTests.java index f634447c..7be6e706 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/mapping/BasicJdbcPersistentPropertyUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/mapping/BasicJdbcPersistentPropertyUnitTests.java @@ -97,8 +97,8 @@ public class BasicJdbcPersistentPropertyUnitTests { public void detectsAnnotatedColumnAndKeyName() { RelationalPersistentProperty listProperty = context // - .getRequiredPersistentEntity(DummyEntity.class) // - .getRequiredPersistentProperty("someList"); + .getRequiredPersistentEntity(DummyEntity.class) // + .getRequiredPersistentProperty("someList"); assertThat(listProperty.getReverseColumnName()).isEqualTo("dummy_column_name"); assertThat(listProperty.getKeyColumn()).isEqualTo("dummy_key_column_name"); diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mybatis/DummyEntity.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mybatis/DummyEntity.java index 18dc5309..757cebd4 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mybatis/DummyEntity.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mybatis/DummyEntity.java @@ -26,8 +26,7 @@ import org.springframework.data.annotation.Id; @Alias("DummyEntity") class DummyEntity { - @Wither - @Id final Long id; + @Wither @Id final Long id; final String name; public DummyEntity(Long id, String name) { diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisHsqlIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisHsqlIntegrationTests.java index b9d24bf7..e7cf9741 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisHsqlIntegrationTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisHsqlIntegrationTests.java @@ -91,8 +91,7 @@ public class MyBatisHsqlIntegrationTests { DataAccessStrategy dataAccessStrategy(RelationalMappingContext context, RelationalConverter converter, SqlSession sqlSession, EmbeddedDatabase db) { return MyBatisDataAccessStrategy.createCombinedAccessStrategy(context, converter, - new NamedParameterJdbcTemplate(db), - sqlSession); + new NamedParameterJdbcTemplate(db), sqlSession); } } diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryManipulateDbActionsIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryManipulateDbActionsIntegrationTests.java index cfa69822..0426b0c9 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryManipulateDbActionsIntegrationTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryManipulateDbActionsIntegrationTests.java @@ -80,7 +80,7 @@ public class JdbcRepositoryManipulateDbActionsIntegrationTests { entity.id, // entity.name, // true) // - ); + ); } @@ -103,14 +103,14 @@ public class JdbcRepositoryManipulateDbActionsIntegrationTests { one.id, // one.name, // true) // - ); + ); assertThat(repository.findById(two.id)) // .contains(new DummyEntity( // two.id, // two.name, // true) // - ); + ); } @Test // DATAJDBC-120 diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryWithCollectionsAndManuallyAssignedIdHsqlIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryWithCollectionsAndManuallyAssignedIdHsqlIntegrationTests.java index 484787a6..968469f4 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryWithCollectionsAndManuallyAssignedIdHsqlIntegrationTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryWithCollectionsAndManuallyAssignedIdHsqlIntegrationTests.java @@ -188,7 +188,7 @@ public class JdbcRepositoryWithCollectionsAndManuallyAssignedIdHsqlIntegrationTe .containsExactlyInAnyOrder( // tuple(element2.id, "two changed"), // tuple(element3.id, "three") // - ); + ); Long count = template.queryForObject("select count(1) from Element", new HashMap<>(), Long.class); assertThat(count).isEqualTo(2); @@ -214,9 +214,6 @@ public class JdbcRepositoryWithCollectionsAndManuallyAssignedIdHsqlIntegrationTe assertThat(count).isEqualTo(0); } - - - private Element createElement(String content) { Element element = new Element(); diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryWithCollectionsIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryWithCollectionsIntegrationTests.java index c0f99d7e..38bb8ef4 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryWithCollectionsIntegrationTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryWithCollectionsIntegrationTests.java @@ -164,7 +164,7 @@ public class JdbcRepositoryWithCollectionsIntegrationTests { .containsExactlyInAnyOrder( // tuple(element2.id, "two changed"), // tuple(element3.id, "three") // - ); + ); Long count = template.queryForObject("select count(1) from Element", new HashMap<>(), Long.class); assertThat(count).isEqualTo(2); @@ -190,9 +190,6 @@ public class JdbcRepositoryWithCollectionsIntegrationTests { assertThat(count).isEqualTo(0); } - - - private Element createElement(String content) { Element element = new Element(); diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryWithListsIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryWithListsIntegrationTests.java index ca05f350..cbf30207 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryWithListsIntegrationTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryWithListsIntegrationTests.java @@ -55,8 +55,7 @@ public class JdbcRepositoryWithListsIntegrationTests { @Import(TestConfiguration.class) static class Config { - @Autowired - JdbcRepositoryFactory factory; + @Autowired JdbcRepositoryFactory factory; @Bean Class testClass() { @@ -69,15 +68,11 @@ public class JdbcRepositoryWithListsIntegrationTests { } } - @ClassRule - public static final SpringClassRule classRule = new SpringClassRule(); - @Rule - public SpringMethodRule methodRule = new SpringMethodRule(); + @ClassRule public static final SpringClassRule classRule = new SpringClassRule(); + @Rule public SpringMethodRule methodRule = new SpringMethodRule(); - @Autowired - NamedParameterJdbcTemplate template; - @Autowired - DummyEntityRepository repository; + @Autowired NamedParameterJdbcTemplate template; + @Autowired DummyEntityRepository repository; @Test // DATAJDBC-130 public void saveAndLoadEmptyList() { @@ -211,14 +206,12 @@ public class JdbcRepositoryWithListsIntegrationTests { return entity; } - interface DummyEntityRepository extends CrudRepository { - } + interface DummyEntityRepository extends CrudRepository {} @Data static class DummyEntity { - @Id - private Long id; + @Id private Long id; String name; List content = new ArrayList<>(); @@ -227,8 +220,7 @@ public class JdbcRepositoryWithListsIntegrationTests { @RequiredArgsConstructor static class Element { - @Id - private Long id; + @Id private Long id; String content; } diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryWithMapsIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryWithMapsIntegrationTests.java index f0efb19c..0a08cd1c 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryWithMapsIntegrationTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryWithMapsIntegrationTests.java @@ -165,7 +165,7 @@ public class JdbcRepositoryWithMapsIntegrationTests { .containsExactlyInAnyOrder( // tuple("two", element2.id, "two changed"), // tuple("three", element3.id, "three") // - ); + ); Long count = template.queryForObject("select count(1) from Element", new HashMap<>(), Long.class); assertThat(count).isEqualTo(2); diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/SimpleJdbcRepositoryEventsUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/SimpleJdbcRepositoryEventsUnitTests.java index 4a2df163..e77729a1 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/SimpleJdbcRepositoryEventsUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/SimpleJdbcRepositoryEventsUnitTests.java @@ -81,8 +81,7 @@ public class SimpleJdbcRepositoryEventsUnitTests { NamedParameterJdbcOperations operations = createIdGeneratingOperations(); SqlGeneratorSource generatorSource = new SqlGeneratorSource(context); - this.dataAccessStrategy = spy( - new DefaultDataAccessStrategy(generatorSource, context, converter, operations)); + this.dataAccessStrategy = spy(new DefaultDataAccessStrategy(generatorSource, context, converter, operations)); JdbcRepositoryFactory factory = new JdbcRepositoryFactory(dataAccessStrategy, context, converter, publisher, operations); @@ -103,7 +102,7 @@ public class SimpleJdbcRepositoryEventsUnitTests { .containsExactly( // BeforeSaveEvent.class, // AfterSaveEvent.class // - ); + ); } @Test // DATAJDBC-99 @@ -122,7 +121,7 @@ public class SimpleJdbcRepositoryEventsUnitTests { AfterSaveEvent.class, // BeforeSaveEvent.class, // AfterSaveEvent.class // - ); + ); } @Test // DATAJDBC-99 @@ -153,7 +152,7 @@ public class SimpleJdbcRepositoryEventsUnitTests { .containsExactly( // BeforeDeleteEvent.class, // AfterDeleteEvent.class // - ); + ); } @Test // DATAJDBC-197 @@ -172,7 +171,7 @@ public class SimpleJdbcRepositoryEventsUnitTests { .containsExactly( // AfterLoadEvent.class, // AfterLoadEvent.class // - ); + ); } @Test // DATAJDBC-197 @@ -191,7 +190,7 @@ public class SimpleJdbcRepositoryEventsUnitTests { .containsExactly( // AfterLoadEvent.class, // AfterLoadEvent.class // - ); + ); } @Test // DATAJDBC-197 @@ -208,7 +207,7 @@ public class SimpleJdbcRepositoryEventsUnitTests { .extracting(e -> (Class) e.getClass()) // .containsExactly( // AfterLoadEvent.class // - ); + ); } private static NamedParameterJdbcOperations createIdGeneratingOperations() { diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/config/EnableJdbcAuditingHsqlIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/config/EnableJdbcAuditingHsqlIntegrationTests.java index 4776a81e..764dc936 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/config/EnableJdbcAuditingHsqlIntegrationTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/config/EnableJdbcAuditingHsqlIntegrationTests.java @@ -73,7 +73,8 @@ public class EnableJdbcAuditingHsqlIntegrationTests { softly.assertThat(entity.getCreatedBy()).as("created by set").isEqualTo("user01"); softly.assertThat(entity.getCreatedDate()).as("created date set").isAfter(now); softly.assertThat(entity.getLastModifiedBy()).as("modified by set").isEqualTo("user01"); - softly.assertThat(entity.getLastModifiedDate()).as("modified date set").isAfterOrEqualTo(entity.getCreatedDate()); + softly.assertThat(entity.getLastModifiedDate()).as("modified date set") + .isAfterOrEqualTo(entity.getCreatedDate()); softly.assertThat(entity.getLastModifiedDate()).as("modified date after instance creation").isAfter(now); AuditingAnnotatedDummyEntity reloaded = repository.findById(entity.id).get(); @@ -97,7 +98,8 @@ public class EnableJdbcAuditingHsqlIntegrationTests { softly.assertThat(entity.getCreatedBy()).as("created by unchanged").isEqualTo("user01"); softly.assertThat(entity.getCreatedDate()).as("created date unchanged").isEqualTo(beforeCreatedDate); softly.assertThat(entity.getLastModifiedBy()).as("modified by updated").isEqualTo("user02"); - softly.assertThat(entity.getLastModifiedDate()).as("modified date updated").isAfter(beforeLastModifiedDate); + softly.assertThat(entity.getLastModifiedDate()).as("modified date updated") + .isAfter(beforeLastModifiedDate); reloaded = repository.findById(entity.id).get(); diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/config/EnableJdbcRepositoriesIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/config/EnableJdbcRepositoriesIntegrationTests.java index abcd128c..32e7e2af 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/config/EnableJdbcRepositoriesIntegrationTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/config/EnableJdbcRepositoriesIntegrationTests.java @@ -90,7 +90,8 @@ public class EnableJdbcRepositoriesIntegrationTests { } @ComponentScan("org.springframework.data.jdbc.testing") - @EnableJdbcRepositories(considerNestedRepositories = true, includeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = DummyRepository.class)) + @EnableJdbcRepositories(considerNestedRepositories = true, + includeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = DummyRepository.class)) static class TestConfiguration { @Bean diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/query/QueryAnnotationHsqlIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/query/QueryAnnotationHsqlIntegrationTests.java index c69bbb75..118b657b 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/query/QueryAnnotationHsqlIntegrationTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/query/QueryAnnotationHsqlIntegrationTests.java @@ -341,7 +341,6 @@ public class QueryAnnotationHsqlIntegrationTests { @Query("SELECT 'one' one, 'two' two, 3 three FROM (VALUES (0))") ImmutableTuple immutableTuple(); - @Value class ImmutableTuple { String one; diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/MariaDBDataSourceConfiguration.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/MariaDBDataSourceConfiguration.java index 60498270..cf52f538 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/MariaDBDataSourceConfiguration.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/MariaDBDataSourceConfiguration.java @@ -28,10 +28,8 @@ import org.testcontainers.containers.MariaDBContainer; import org.testcontainers.jdbc.ext.ScriptUtils; /** - * {@link DataSource} setup for MariaDB. - * - * Starts a Docker-container with a MariaDB database, and sets up database "test". - + * {@link DataSource} setup for MariaDB. Starts a Docker-container with a MariaDB database, and sets up database "test". + * * @author Christoph Preißner */ @Configuration @@ -56,7 +54,7 @@ class MariaDBDataSourceConfiguration extends DataSourceConfiguration { dataSource.setUser(MARIADB_CONTAINER.getUsername()); dataSource.setPassword(MARIADB_CONTAINER.getPassword()); return dataSource; - } catch(SQLException sqlex) { + } catch (SQLException sqlex) { throw new RuntimeException(sqlex); } } diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/MySqlDataSourceConfiguration.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/MySqlDataSourceConfiguration.java index f82203fb..722db612 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/MySqlDataSourceConfiguration.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/MySqlDataSourceConfiguration.java @@ -29,9 +29,8 @@ import org.testcontainers.jdbc.ext.ScriptUtils; import com.mysql.jdbc.jdbc2.optional.MysqlDataSource; /** - * {@link DataSource} setup for MySQL. - * - * Starts a docker container with a MySql database and sets up a database name "test" in it. + * {@link DataSource} setup for MySQL. Starts a docker container with a MySql database and sets up a database name + * "test" in it. * * @author Jens Schauder * @author Oliver Gierke diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/PostgresDataSourceConfiguration.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/PostgresDataSourceConfiguration.java index 9adfdca1..6242aa48 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/PostgresDataSourceConfiguration.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/PostgresDataSourceConfiguration.java @@ -24,9 +24,7 @@ import org.springframework.jdbc.datasource.init.ResourceDatabasePopulator; import org.testcontainers.containers.PostgreSQLContainer; /** - * {@link DataSource} setup for PostgreSQL. - * - * Starts a docker container with a Postgres database. + * {@link DataSource} setup for PostgreSQL. Starts a docker container with a Postgres database. * * @author Jens Schauder * @author Oliver Gierke diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/conversion/DbAction.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/conversion/DbAction.java index d8b6d9f4..41bb5ada 100644 --- a/spring-data-relational/src/main/java/org/springframework/data/relational/core/conversion/DbAction.java +++ b/spring-data-relational/src/main/java/org/springframework/data/relational/core/conversion/DbAction.java @@ -25,9 +25,7 @@ import java.util.Map; import org.springframework.data.mapping.PersistentPropertyPath; import org.springframework.data.relational.core.mapping.RelationalPersistentProperty; -import org.springframework.data.util.Pair; import org.springframework.lang.Nullable; -import org.springframework.util.Assert; /** * An instance of this interface represents a (conceptual) single interaction with a database, e.g. a single update, @@ -242,7 +240,7 @@ public interface DbAction { * * @author Jens Schauder */ - interface WithDependingOn extends WithPropertyPath, WithEntity{ + interface WithDependingOn extends WithPropertyPath, WithEntity { /** * The {@link DbAction} of a parent entity, possibly the aggregate root. This is used to obtain values needed to diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/conversion/RelationalConverter.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/conversion/RelationalConverter.java index e0f14e45..6c5bf87b 100644 --- a/spring-data-relational/src/main/java/org/springframework/data/relational/core/conversion/RelationalConverter.java +++ b/spring-data-relational/src/main/java/org/springframework/data/relational/core/conversion/RelationalConverter.java @@ -56,7 +56,8 @@ public interface RelationalConverter { * properties. * * @param entity the kind of entity to create. Must not be {@code null}. - * @param parameterValueProvider a function that provides the value to pass to a constructor, given a {@link Parameter}. Must not be {@code null}. + * @param parameterValueProvider a function that provides the value to pass to a constructor, given a + * {@link Parameter}. Must not be {@code null}. * @param the type of entity to create. * @return the instantiated entity. Guaranteed to be not {@code null}. */ diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/conversion/RelationalEntityWriter.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/conversion/RelationalEntityWriter.java index 1b6b01c5..3c5e880c 100644 --- a/spring-data-relational/src/main/java/org/springframework/data/relational/core/conversion/RelationalEntityWriter.java +++ b/spring-data-relational/src/main/java/org/springframework/data/relational/core/conversion/RelationalEntityWriter.java @@ -15,6 +15,8 @@ */ package org.springframework.data.relational.core.conversion; +import lombok.Value; + import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -22,7 +24,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import lombok.Value; import org.springframework.data.convert.EntityWriter; import org.springframework.data.mapping.PersistentProperty; import org.springframework.data.mapping.PersistentPropertyPath; @@ -241,8 +242,8 @@ public class RelationalEntityWriter implements EntityWriter path; /** - * The parent {@link PathNode}. This is {@code null} if this is - * the root entity. + * The parent {@link PathNode}. This is {@code null} if this is the root entity. */ - @Nullable - PathNode parent; + @Nullable PathNode parent; /** The value of the entity. */ Object value; diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/NamingStrategy.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/NamingStrategy.java index e11b0d4e..c6f49ee3 100644 --- a/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/NamingStrategy.java +++ b/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/NamingStrategy.java @@ -61,8 +61,8 @@ public interface NamingStrategy { } /** - * Defaults to return the given {@link RelationalPersistentProperty}'s name with the parts of a camel case name separated by - * '_'; + * Defaults to return the given {@link RelationalPersistentProperty}'s name with the parts of a camel case name + * separated by '_'; */ default String getColumnName(RelationalPersistentProperty property) { diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/RelationalPersistentProperty.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/RelationalPersistentProperty.java index f1a31502..80ec5f35 100644 --- a/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/RelationalPersistentProperty.java +++ b/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/RelationalPersistentProperty.java @@ -15,7 +15,6 @@ */ package org.springframework.data.relational.core.mapping; -import org.springframework.core.convert.TypeDescriptor; import org.springframework.data.mapping.PersistentProperty; import org.springframework.lang.Nullable; @@ -45,8 +44,8 @@ public interface RelationalPersistentProperty extends PersistentProperty(Arrays.asList(UUID.class)), true); - + RelationalMappingContext mappingContext = new RelationalMappingContext(); mappingContext.setSimpleTypeHolder(holder); - + RelationalPersistentEntity entity = mappingContext.getPersistentEntity(EntityWithUuid.class); RelationalPersistentProperty uuidProperty = entity.getRequiredPersistentProperty("uuid"); @@ -49,6 +49,5 @@ public class RelationalMappingContextUnitTests { static class EntityWithUuid { @Id UUID uuid; } - - + } diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/mapping/RelationalPersistentEntityImplUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/mapping/RelationalPersistentEntityImplUnitTests.java index eaebe4cc..eaca6694 100644 --- a/spring-data-relational/src/test/java/org/springframework/data/relational/core/mapping/RelationalPersistentEntityImplUnitTests.java +++ b/spring-data-relational/src/test/java/org/springframework/data/relational/core/mapping/RelationalPersistentEntityImplUnitTests.java @@ -18,10 +18,6 @@ package org.springframework.data.relational.core.mapping; import static org.assertj.core.api.Assertions.*; import org.junit.Test; -import org.springframework.data.relational.core.mapping.RelationalMappingContext; -import org.springframework.data.relational.core.mapping.RelationalPersistentEntity; -import org.springframework.data.relational.core.mapping.RelationalPersistentEntityImpl; -import org.springframework.data.relational.core.mapping.Table; /** * Unit tests for {@link RelationalPersistentEntityImpl}. diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/mapping/event/IdentifierTest.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/mapping/event/IdentifierTest.java index bc7c12b4..39ee4d33 100644 --- a/spring-data-relational/src/test/java/org/springframework/data/relational/core/mapping/event/IdentifierTest.java +++ b/spring-data-relational/src/test/java/org/springframework/data/relational/core/mapping/event/IdentifierTest.java @@ -15,12 +15,11 @@ */ package org.springframework.data.relational.core.mapping.event; -import org.junit.Test; -import org.springframework.data.relational.core.mapping.event.Identifier; +import static org.assertj.core.api.Assertions.*; import java.util.Optional; -import static org.assertj.core.api.Assertions.assertThat; +import org.junit.Test; /** * Unit tests for {@link Identifier} @@ -40,7 +39,7 @@ public class IdentifierTest { } @Test - public void indentifierOfNullHasEmptyValue(){ + public void indentifierOfNullHasEmptyValue() { Identifier identifier = Identifier.ofNullable(null); @@ -49,10 +48,10 @@ public class IdentifierTest { @SuppressWarnings("unchecked") @Test - public void indentifierOfXHasValueX(){ + public void indentifierOfXHasValueX() { Identifier identifier = Identifier.ofNullable("x"); assertThat((Optional) identifier.getOptionalValue()).hasValue("x"); } -} \ No newline at end of file +}