From e4de5701d45a77560c5c15f0a4d1e3450ca78ce1 Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Fri, 18 May 2018 16:34:08 +0200 Subject: [PATCH] DATAJDBC-138 - Polishing. Moved all types from mapping.model into model to align with the setup of other Spring Data modules. Original pull request: #67. --- .../jdbc/core/CascadingDataAccessStrategy.java | 2 +- .../data/jdbc/core/DataAccessStrategy.java | 2 +- .../jdbc/core/DefaultDataAccessStrategy.java | 10 +++++----- .../data/jdbc/core/DefaultJdbcInterpreter.java | 4 ++-- .../jdbc/core/DelegatingDataAccessStrategy.java | 2 +- .../data/jdbc/core/EntityRowMapper.java | 6 +++--- .../data/jdbc/core/JdbcAggregateTemplate.java | 4 ++-- .../data/jdbc/core/SqlGenerator.java | 6 +++--- .../data/jdbc/core/SqlGeneratorSource.java | 2 +- .../core/conversion/JdbcEntityDeleteWriter.java | 2 +- .../jdbc/core/conversion/JdbcEntityWriter.java | 8 ++++---- .../conversion/JdbcEntityWriterSupport.java | 2 +- .../BasicJdbcPersistentEntityInformation.java | 2 +- .../BasicJdbcPersistentProperty.java | 4 ++-- .../{mapping/model => core/mapping}/Column.java | 2 +- .../{model => }/ConversionCustomizer.java | 2 +- .../{model => }/DelimiterNamingStrategy.java | 2 +- .../mapping/{model => }/JdbcMappingContext.java | 2 +- .../{model => }/JdbcPersistentEntity.java | 2 +- .../{model => }/JdbcPersistentEntityImpl.java | 2 +- .../JdbcPersistentEntityInformation.java | 2 +- .../{model => }/JdbcPersistentProperty.java | 2 +- .../mapping/{model => }/NamingStrategy.java | 2 +- .../{mapping/model => core/mapping}/Table.java | 2 +- .../support/JdbcAuditingEventListener.java | 4 ++-- .../jdbc/mybatis/MyBatisDataAccessStrategy.java | 4 ++-- .../repository/config/JdbcConfiguration.java | 6 +++--- .../support/JdbcQueryLookupStrategy.java | 2 +- .../support/JdbcRepositoryFactory.java | 4 ++-- .../support/JdbcRepositoryFactoryBean.java | 2 +- .../repository/support/JdbcRepositoryQuery.java | 2 +- .../support/SimpleJdbcRepository.java | 17 +++-------------- .../CascadingDataAccessStrategyUnitTests.java | 2 +- .../DefaultDataAccessStrategyUnitTests.java | 4 ++-- .../core/DefaultJdbcInterpreterUnitTests.java | 6 +++--- .../jdbc/core/EntityRowMapperUnitTests.java | 8 ++++---- .../JdbcEntityTemplateIntegrationTests.java | 2 +- .../MyBatisDataAccessStrategyUnitTests.java | 2 +- ...atorContextBasedNamingStrategyUnitTests.java | 6 +++--- ...qlGeneratorFixedNamingStrategyUnitTests.java | 8 ++++---- .../data/jdbc/core/SqlGeneratorUnitTests.java | 8 ++++---- .../JdbcEntityDeleteWriterUnitTests.java | 2 +- .../conversion/JdbcEntityWriterUnitTests.java | 2 +- ...dbcPersistentEntityInformationUnitTests.java | 4 +++- .../BasicJdbcPersistentPropertyUnitTests.java | 7 ++++++- .../DelimiterNamingStrategyUnitTests.java | 5 ++++- .../JdbcMappingContextUnitTests.java | 3 ++- .../JdbcPersistentEntityImplUnitTests.java | 6 +++++- .../mapping}/NamingStrategyUnitTests.java | 7 +++++-- .../mybatis/MyBatisHsqlIntegrationTests.java | 2 +- ...cRepositoryIdGenerationIntegrationTests.java | 2 +- .../SimpleJdbcRepositoryEventsUnitTests.java | 2 +- .../EnableJdbcAuditingHsqlIntegrationTests.java | 2 +- .../JdbcQueryLookupStrategyUnitTests.java | 2 +- .../JdbcRepositoryFactoryBeanUnitTests.java | 2 +- .../data/jdbc/testing/TestConfiguration.java | 6 +++--- 56 files changed, 112 insertions(+), 105 deletions(-) rename src/main/java/org/springframework/data/jdbc/core/mapping/{model => }/BasicJdbcPersistentEntityInformation.java (97%) rename src/main/java/org/springframework/data/jdbc/core/mapping/{model => }/BasicJdbcPersistentProperty.java (96%) rename src/main/java/org/springframework/data/jdbc/{mapping/model => core/mapping}/Column.java (95%) rename src/main/java/org/springframework/data/jdbc/core/mapping/{model => }/ConversionCustomizer.java (93%) rename src/main/java/org/springframework/data/jdbc/core/mapping/{model => }/DelimiterNamingStrategy.java (97%) rename src/main/java/org/springframework/data/jdbc/core/mapping/{model => }/JdbcMappingContext.java (98%) rename src/main/java/org/springframework/data/jdbc/core/mapping/{model => }/JdbcPersistentEntity.java (95%) rename src/main/java/org/springframework/data/jdbc/core/mapping/{model => }/JdbcPersistentEntityImpl.java (97%) rename src/main/java/org/springframework/data/jdbc/core/mapping/{model => }/JdbcPersistentEntityInformation.java (95%) rename src/main/java/org/springframework/data/jdbc/core/mapping/{model => }/JdbcPersistentProperty.java (96%) rename src/main/java/org/springframework/data/jdbc/core/mapping/{model => }/NamingStrategy.java (97%) rename src/main/java/org/springframework/data/jdbc/{mapping/model => core/mapping}/Table.java (95%) rename src/test/java/org/springframework/data/jdbc/core/mapping/{model => }/BasicJdbcPersistentEntityInformationUnitTests.java (92%) rename src/test/java/org/springframework/data/jdbc/core/mapping/{model => }/BasicJdbcPersistentPropertyUnitTests.java (85%) rename src/test/java/org/springframework/data/jdbc/core/mapping/{model => }/DelimiterNamingStrategyUnitTests.java (90%) rename src/test/java/org/springframework/data/jdbc/core/mapping/{model => }/JdbcMappingContextUnitTests.java (93%) rename src/test/java/org/springframework/data/jdbc/{mapping/model => core/mapping}/JdbcPersistentEntityImplUnitTests.java (78%) rename src/test/java/org/springframework/data/jdbc/{mapping/model => core/mapping}/NamingStrategyUnitTests.java (88%) diff --git a/src/main/java/org/springframework/data/jdbc/core/CascadingDataAccessStrategy.java b/src/main/java/org/springframework/data/jdbc/core/CascadingDataAccessStrategy.java index dd0eb41b..d33d9f8a 100644 --- a/src/main/java/org/springframework/data/jdbc/core/CascadingDataAccessStrategy.java +++ b/src/main/java/org/springframework/data/jdbc/core/CascadingDataAccessStrategy.java @@ -21,7 +21,7 @@ import java.util.Map; import java.util.function.Consumer; import java.util.function.Function; -import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentProperty; +import org.springframework.data.jdbc.core.mapping.JdbcPersistentProperty; import org.springframework.data.mapping.PropertyPath; /** diff --git a/src/main/java/org/springframework/data/jdbc/core/DataAccessStrategy.java b/src/main/java/org/springframework/data/jdbc/core/DataAccessStrategy.java index e2fab444..834e8eb2 100644 --- a/src/main/java/org/springframework/data/jdbc/core/DataAccessStrategy.java +++ b/src/main/java/org/springframework/data/jdbc/core/DataAccessStrategy.java @@ -17,7 +17,7 @@ package org.springframework.data.jdbc.core; import java.util.Map; -import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentProperty; +import org.springframework.data.jdbc.core.mapping.JdbcPersistentProperty; import org.springframework.data.mapping.PropertyPath; /** diff --git a/src/main/java/org/springframework/data/jdbc/core/DefaultDataAccessStrategy.java b/src/main/java/org/springframework/data/jdbc/core/DefaultDataAccessStrategy.java index c1f0344b..db14c4bf 100644 --- a/src/main/java/org/springframework/data/jdbc/core/DefaultDataAccessStrategy.java +++ b/src/main/java/org/springframework/data/jdbc/core/DefaultDataAccessStrategy.java @@ -27,11 +27,11 @@ import java.util.stream.StreamSupport; import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.dao.InvalidDataAccessApiUsageException; import org.springframework.dao.NonTransientDataAccessException; -import org.springframework.data.jdbc.core.mapping.model.BasicJdbcPersistentEntityInformation; -import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext; -import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentEntity; -import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentEntityInformation; -import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentProperty; +import org.springframework.data.jdbc.core.mapping.BasicJdbcPersistentEntityInformation; +import org.springframework.data.jdbc.core.mapping.JdbcMappingContext; +import org.springframework.data.jdbc.core.mapping.JdbcPersistentEntity; +import org.springframework.data.jdbc.core.mapping.JdbcPersistentEntityInformation; +import org.springframework.data.jdbc.core.mapping.JdbcPersistentProperty; import org.springframework.data.jdbc.support.JdbcUtil; import org.springframework.data.mapping.PropertyHandler; import org.springframework.data.mapping.PropertyPath; diff --git a/src/main/java/org/springframework/data/jdbc/core/DefaultJdbcInterpreter.java b/src/main/java/org/springframework/data/jdbc/core/DefaultJdbcInterpreter.java index bd1e9a02..bc60dbcd 100644 --- a/src/main/java/org/springframework/data/jdbc/core/DefaultJdbcInterpreter.java +++ b/src/main/java/org/springframework/data/jdbc/core/DefaultJdbcInterpreter.java @@ -23,9 +23,9 @@ import org.springframework.data.jdbc.core.conversion.DbAction.Delete; import org.springframework.data.jdbc.core.conversion.DbAction.DeleteAll; import org.springframework.data.jdbc.core.conversion.DbAction.Insert; import org.springframework.data.jdbc.core.conversion.DbAction.Update; +import org.springframework.data.jdbc.core.mapping.JdbcMappingContext; +import org.springframework.data.jdbc.core.mapping.JdbcPersistentEntity; import org.springframework.data.jdbc.core.conversion.Interpreter; -import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext; -import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentEntity; import org.springframework.data.mapping.PropertyPath; import org.springframework.util.Assert; diff --git a/src/main/java/org/springframework/data/jdbc/core/DelegatingDataAccessStrategy.java b/src/main/java/org/springframework/data/jdbc/core/DelegatingDataAccessStrategy.java index 91a360b6..5cd7f2cf 100644 --- a/src/main/java/org/springframework/data/jdbc/core/DelegatingDataAccessStrategy.java +++ b/src/main/java/org/springframework/data/jdbc/core/DelegatingDataAccessStrategy.java @@ -17,7 +17,7 @@ package org.springframework.data.jdbc.core; import java.util.Map; -import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentProperty; +import org.springframework.data.jdbc.core.mapping.JdbcPersistentProperty; import org.springframework.data.mapping.PropertyPath; import org.springframework.util.Assert; diff --git a/src/main/java/org/springframework/data/jdbc/core/EntityRowMapper.java b/src/main/java/org/springframework/data/jdbc/core/EntityRowMapper.java index 1a11c33d..644a41f9 100644 --- a/src/main/java/org/springframework/data/jdbc/core/EntityRowMapper.java +++ b/src/main/java/org/springframework/data/jdbc/core/EntityRowMapper.java @@ -26,9 +26,9 @@ import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.converter.Converter; import org.springframework.data.convert.ClassGeneratingEntityInstantiator; import org.springframework.data.convert.EntityInstantiator; -import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext; -import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentEntity; -import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentProperty; +import org.springframework.data.jdbc.core.mapping.JdbcMappingContext; +import org.springframework.data.jdbc.core.mapping.JdbcPersistentEntity; +import org.springframework.data.jdbc.core.mapping.JdbcPersistentProperty; import org.springframework.data.mapping.MappingException; import org.springframework.data.mapping.PersistentProperty; import org.springframework.data.mapping.PersistentPropertyAccessor; diff --git a/src/main/java/org/springframework/data/jdbc/core/JdbcAggregateTemplate.java b/src/main/java/org/springframework/data/jdbc/core/JdbcAggregateTemplate.java index 853355ad..5e5305dc 100644 --- a/src/main/java/org/springframework/data/jdbc/core/JdbcAggregateTemplate.java +++ b/src/main/java/org/springframework/data/jdbc/core/JdbcAggregateTemplate.java @@ -23,6 +23,8 @@ import org.springframework.data.jdbc.core.conversion.AggregateChange.Kind; import org.springframework.data.jdbc.core.conversion.Interpreter; import org.springframework.data.jdbc.core.conversion.JdbcEntityDeleteWriter; import org.springframework.data.jdbc.core.conversion.JdbcEntityWriter; +import org.springframework.data.jdbc.core.mapping.JdbcMappingContext; +import org.springframework.data.jdbc.core.mapping.JdbcPersistentEntityInformation; import org.springframework.data.jdbc.core.mapping.event.AfterDeleteEvent; import org.springframework.data.jdbc.core.mapping.event.AfterLoadEvent; import org.springframework.data.jdbc.core.mapping.event.AfterSaveEvent; @@ -30,8 +32,6 @@ import org.springframework.data.jdbc.core.mapping.event.BeforeDeleteEvent; import org.springframework.data.jdbc.core.mapping.event.BeforeSaveEvent; import org.springframework.data.jdbc.core.mapping.event.Identifier; import org.springframework.data.jdbc.core.mapping.event.Identifier.Specified; -import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext; -import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentEntityInformation; /** * {@link JdbcAggregateOperations} implementation, storing aggregates in and obtaining them from a JDBC data store. diff --git a/src/main/java/org/springframework/data/jdbc/core/SqlGenerator.java b/src/main/java/org/springframework/data/jdbc/core/SqlGenerator.java index a78c9cc5..31babd24 100644 --- a/src/main/java/org/springframework/data/jdbc/core/SqlGenerator.java +++ b/src/main/java/org/springframework/data/jdbc/core/SqlGenerator.java @@ -15,9 +15,9 @@ */ package org.springframework.data.jdbc.core; -import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext; -import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentEntity; -import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentProperty; +import org.springframework.data.jdbc.core.mapping.JdbcMappingContext; +import org.springframework.data.jdbc.core.mapping.JdbcPersistentEntity; +import org.springframework.data.jdbc.core.mapping.JdbcPersistentProperty; import org.springframework.data.jdbc.repository.support.SimpleJdbcRepository; import org.springframework.data.mapping.PropertyHandler; import org.springframework.data.mapping.PropertyPath; diff --git a/src/main/java/org/springframework/data/jdbc/core/SqlGeneratorSource.java b/src/main/java/org/springframework/data/jdbc/core/SqlGeneratorSource.java index c32de536..166a9d8d 100644 --- a/src/main/java/org/springframework/data/jdbc/core/SqlGeneratorSource.java +++ b/src/main/java/org/springframework/data/jdbc/core/SqlGeneratorSource.java @@ -20,7 +20,7 @@ import lombok.RequiredArgsConstructor; import java.util.HashMap; import java.util.Map; -import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext; +import org.springframework.data.jdbc.core.mapping.JdbcMappingContext; /** * Provides {@link SqlGenerator}s per domain type. Instances get cached, so when asked multiple times for the same domain diff --git a/src/main/java/org/springframework/data/jdbc/core/conversion/JdbcEntityDeleteWriter.java b/src/main/java/org/springframework/data/jdbc/core/conversion/JdbcEntityDeleteWriter.java index d6711e9f..8050fbde 100644 --- a/src/main/java/org/springframework/data/jdbc/core/conversion/JdbcEntityDeleteWriter.java +++ b/src/main/java/org/springframework/data/jdbc/core/conversion/JdbcEntityDeleteWriter.java @@ -15,7 +15,7 @@ */ package org.springframework.data.jdbc.core.conversion; -import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext; +import org.springframework.data.jdbc.core.mapping.JdbcMappingContext; /** * Converts an entity that is about to be deleted into {@link DbAction}s inside a {@link AggregateChange} that need to be diff --git a/src/main/java/org/springframework/data/jdbc/core/conversion/JdbcEntityWriter.java b/src/main/java/org/springframework/data/jdbc/core/conversion/JdbcEntityWriter.java index b96ed81a..81832df3 100644 --- a/src/main/java/org/springframework/data/jdbc/core/conversion/JdbcEntityWriter.java +++ b/src/main/java/org/springframework/data/jdbc/core/conversion/JdbcEntityWriter.java @@ -25,10 +25,10 @@ import java.util.stream.Stream; import org.springframework.data.jdbc.core.conversion.DbAction.Insert; import org.springframework.data.jdbc.core.conversion.DbAction.Update; -import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext; -import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentEntity; -import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentEntityInformation; -import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentProperty; +import org.springframework.data.jdbc.core.mapping.JdbcMappingContext; +import org.springframework.data.jdbc.core.mapping.JdbcPersistentEntity; +import org.springframework.data.jdbc.core.mapping.JdbcPersistentEntityInformation; +import org.springframework.data.jdbc.core.mapping.JdbcPersistentProperty; import org.springframework.data.mapping.PersistentProperty; import org.springframework.data.mapping.PersistentPropertyAccessor; import org.springframework.data.util.StreamUtils; diff --git a/src/main/java/org/springframework/data/jdbc/core/conversion/JdbcEntityWriterSupport.java b/src/main/java/org/springframework/data/jdbc/core/conversion/JdbcEntityWriterSupport.java index f8968ce8..40a1d42d 100644 --- a/src/main/java/org/springframework/data/jdbc/core/conversion/JdbcEntityWriterSupport.java +++ b/src/main/java/org/springframework/data/jdbc/core/conversion/JdbcEntityWriterSupport.java @@ -16,7 +16,7 @@ package org.springframework.data.jdbc.core.conversion; import org.springframework.data.convert.EntityWriter; -import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext; +import org.springframework.data.jdbc.core.mapping.JdbcMappingContext; /** * Common infrastructure needed by different implementations of {@link EntityWriter}. diff --git a/src/main/java/org/springframework/data/jdbc/core/mapping/model/BasicJdbcPersistentEntityInformation.java b/src/main/java/org/springframework/data/jdbc/core/mapping/BasicJdbcPersistentEntityInformation.java similarity index 97% rename from src/main/java/org/springframework/data/jdbc/core/mapping/model/BasicJdbcPersistentEntityInformation.java rename to src/main/java/org/springframework/data/jdbc/core/mapping/BasicJdbcPersistentEntityInformation.java index 08a57576..92682f97 100644 --- a/src/main/java/org/springframework/data/jdbc/core/mapping/model/BasicJdbcPersistentEntityInformation.java +++ b/src/main/java/org/springframework/data/jdbc/core/mapping/BasicJdbcPersistentEntityInformation.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.jdbc.core.mapping.model; +package org.springframework.data.jdbc.core.mapping; import org.springframework.data.domain.Persistable; import org.springframework.data.repository.core.support.PersistentEntityInformation; diff --git a/src/main/java/org/springframework/data/jdbc/core/mapping/model/BasicJdbcPersistentProperty.java b/src/main/java/org/springframework/data/jdbc/core/mapping/BasicJdbcPersistentProperty.java similarity index 96% rename from src/main/java/org/springframework/data/jdbc/core/mapping/model/BasicJdbcPersistentProperty.java rename to src/main/java/org/springframework/data/jdbc/core/mapping/BasicJdbcPersistentProperty.java index 42d21e65..b1012441 100644 --- a/src/main/java/org/springframework/data/jdbc/core/mapping/model/BasicJdbcPersistentProperty.java +++ b/src/main/java/org/springframework/data/jdbc/core/mapping/BasicJdbcPersistentProperty.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.jdbc.core.mapping.model; +package org.springframework.data.jdbc.core.mapping; import java.time.ZonedDateTime; import java.time.temporal.Temporal; @@ -39,7 +39,7 @@ import org.springframework.util.ClassUtils; * @author Greg Turnquist * @since 1.0 */ -public class BasicJdbcPersistentProperty extends AnnotationBasedPersistentProperty +class BasicJdbcPersistentProperty extends AnnotationBasedPersistentProperty implements JdbcPersistentProperty { private static final Map, Class> javaToDbType = new LinkedHashMap<>(); diff --git a/src/main/java/org/springframework/data/jdbc/mapping/model/Column.java b/src/main/java/org/springframework/data/jdbc/core/mapping/Column.java similarity index 95% rename from src/main/java/org/springframework/data/jdbc/mapping/model/Column.java rename to src/main/java/org/springframework/data/jdbc/core/mapping/Column.java index a8902171..1adcd81a 100644 --- a/src/main/java/org/springframework/data/jdbc/mapping/model/Column.java +++ b/src/main/java/org/springframework/data/jdbc/core/mapping/Column.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.jdbc.mapping.model; +package org.springframework.data.jdbc.core.mapping; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/src/main/java/org/springframework/data/jdbc/core/mapping/model/ConversionCustomizer.java b/src/main/java/org/springframework/data/jdbc/core/mapping/ConversionCustomizer.java similarity index 93% rename from src/main/java/org/springframework/data/jdbc/core/mapping/model/ConversionCustomizer.java rename to src/main/java/org/springframework/data/jdbc/core/mapping/ConversionCustomizer.java index 13f932df..639bf30e 100644 --- a/src/main/java/org/springframework/data/jdbc/core/mapping/model/ConversionCustomizer.java +++ b/src/main/java/org/springframework/data/jdbc/core/mapping/ConversionCustomizer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.jdbc.core.mapping.model; +package org.springframework.data.jdbc.core.mapping; import org.springframework.core.convert.support.GenericConversionService; diff --git a/src/main/java/org/springframework/data/jdbc/core/mapping/model/DelimiterNamingStrategy.java b/src/main/java/org/springframework/data/jdbc/core/mapping/DelimiterNamingStrategy.java similarity index 97% rename from src/main/java/org/springframework/data/jdbc/core/mapping/model/DelimiterNamingStrategy.java rename to src/main/java/org/springframework/data/jdbc/core/mapping/DelimiterNamingStrategy.java index 1520130a..11774504 100644 --- a/src/main/java/org/springframework/data/jdbc/core/mapping/model/DelimiterNamingStrategy.java +++ b/src/main/java/org/springframework/data/jdbc/core/mapping/DelimiterNamingStrategy.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.jdbc.core.mapping.model; +package org.springframework.data.jdbc.core.mapping; import org.springframework.data.util.ParsingUtils; diff --git a/src/main/java/org/springframework/data/jdbc/core/mapping/model/JdbcMappingContext.java b/src/main/java/org/springframework/data/jdbc/core/mapping/JdbcMappingContext.java similarity index 98% rename from src/main/java/org/springframework/data/jdbc/core/mapping/model/JdbcMappingContext.java rename to src/main/java/org/springframework/data/jdbc/core/mapping/JdbcMappingContext.java index 4c39705b..fb8c972a 100644 --- a/src/main/java/org/springframework/data/jdbc/core/mapping/model/JdbcMappingContext.java +++ b/src/main/java/org/springframework/data/jdbc/core/mapping/JdbcMappingContext.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.jdbc.core.mapping.model; +package org.springframework.data.jdbc.core.mapping; import static java.util.Arrays.*; diff --git a/src/main/java/org/springframework/data/jdbc/core/mapping/model/JdbcPersistentEntity.java b/src/main/java/org/springframework/data/jdbc/core/mapping/JdbcPersistentEntity.java similarity index 95% rename from src/main/java/org/springframework/data/jdbc/core/mapping/model/JdbcPersistentEntity.java rename to src/main/java/org/springframework/data/jdbc/core/mapping/JdbcPersistentEntity.java index fa203d05..7ef97949 100644 --- a/src/main/java/org/springframework/data/jdbc/core/mapping/model/JdbcPersistentEntity.java +++ b/src/main/java/org/springframework/data/jdbc/core/mapping/JdbcPersistentEntity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.jdbc.core.mapping.model; +package org.springframework.data.jdbc.core.mapping; import org.springframework.data.mapping.model.MutablePersistentEntity; diff --git a/src/main/java/org/springframework/data/jdbc/core/mapping/model/JdbcPersistentEntityImpl.java b/src/main/java/org/springframework/data/jdbc/core/mapping/JdbcPersistentEntityImpl.java similarity index 97% rename from src/main/java/org/springframework/data/jdbc/core/mapping/model/JdbcPersistentEntityImpl.java rename to src/main/java/org/springframework/data/jdbc/core/mapping/JdbcPersistentEntityImpl.java index b6c7d4c9..d759fde1 100644 --- a/src/main/java/org/springframework/data/jdbc/core/mapping/model/JdbcPersistentEntityImpl.java +++ b/src/main/java/org/springframework/data/jdbc/core/mapping/JdbcPersistentEntityImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.jdbc.core.mapping.model; +package org.springframework.data.jdbc.core.mapping; import java.util.Optional; diff --git a/src/main/java/org/springframework/data/jdbc/core/mapping/model/JdbcPersistentEntityInformation.java b/src/main/java/org/springframework/data/jdbc/core/mapping/JdbcPersistentEntityInformation.java similarity index 95% rename from src/main/java/org/springframework/data/jdbc/core/mapping/model/JdbcPersistentEntityInformation.java rename to src/main/java/org/springframework/data/jdbc/core/mapping/JdbcPersistentEntityInformation.java index 4b39682b..d14017be 100644 --- a/src/main/java/org/springframework/data/jdbc/core/mapping/model/JdbcPersistentEntityInformation.java +++ b/src/main/java/org/springframework/data/jdbc/core/mapping/JdbcPersistentEntityInformation.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.jdbc.core.mapping.model; +package org.springframework.data.jdbc.core.mapping; import org.springframework.data.repository.core.EntityInformation; diff --git a/src/main/java/org/springframework/data/jdbc/core/mapping/model/JdbcPersistentProperty.java b/src/main/java/org/springframework/data/jdbc/core/mapping/JdbcPersistentProperty.java similarity index 96% rename from src/main/java/org/springframework/data/jdbc/core/mapping/model/JdbcPersistentProperty.java rename to src/main/java/org/springframework/data/jdbc/core/mapping/JdbcPersistentProperty.java index 8caf0a2e..ebf0b5a5 100644 --- a/src/main/java/org/springframework/data/jdbc/core/mapping/model/JdbcPersistentProperty.java +++ b/src/main/java/org/springframework/data/jdbc/core/mapping/JdbcPersistentProperty.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.jdbc.core.mapping.model; +package org.springframework.data.jdbc.core.mapping; import org.springframework.data.mapping.PersistentProperty; diff --git a/src/main/java/org/springframework/data/jdbc/core/mapping/model/NamingStrategy.java b/src/main/java/org/springframework/data/jdbc/core/mapping/NamingStrategy.java similarity index 97% rename from src/main/java/org/springframework/data/jdbc/core/mapping/model/NamingStrategy.java rename to src/main/java/org/springframework/data/jdbc/core/mapping/NamingStrategy.java index 93b9cbb6..fc5a5c93 100644 --- a/src/main/java/org/springframework/data/jdbc/core/mapping/model/NamingStrategy.java +++ b/src/main/java/org/springframework/data/jdbc/core/mapping/NamingStrategy.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.jdbc.core.mapping.model; +package org.springframework.data.jdbc.core.mapping; /** * Interface and default implementation of a naming strategy. Defaults to no schema, table name based on {@link Class} diff --git a/src/main/java/org/springframework/data/jdbc/mapping/model/Table.java b/src/main/java/org/springframework/data/jdbc/core/mapping/Table.java similarity index 95% rename from src/main/java/org/springframework/data/jdbc/mapping/model/Table.java rename to src/main/java/org/springframework/data/jdbc/core/mapping/Table.java index 63f435ca..3c68c53d 100644 --- a/src/main/java/org/springframework/data/jdbc/mapping/model/Table.java +++ b/src/main/java/org/springframework/data/jdbc/core/mapping/Table.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.jdbc.mapping.model; +package org.springframework.data.jdbc.core.mapping; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/src/main/java/org/springframework/data/jdbc/domain/support/JdbcAuditingEventListener.java b/src/main/java/org/springframework/data/jdbc/domain/support/JdbcAuditingEventListener.java index 671a3ea2..737750ce 100644 --- a/src/main/java/org/springframework/data/jdbc/domain/support/JdbcAuditingEventListener.java +++ b/src/main/java/org/springframework/data/jdbc/domain/support/JdbcAuditingEventListener.java @@ -19,9 +19,9 @@ import lombok.RequiredArgsConstructor; import org.springframework.context.ApplicationListener; import org.springframework.data.auditing.AuditingHandler; +import org.springframework.data.jdbc.core.mapping.JdbcMappingContext; +import org.springframework.data.jdbc.core.mapping.JdbcPersistentEntityInformation; import org.springframework.data.jdbc.core.mapping.event.BeforeSaveEvent; -import org.springframework.data.jdbc.mapping.model.JdbcMappingContext; -import org.springframework.data.jdbc.mapping.model.JdbcPersistentEntityInformation; import org.springframework.data.jdbc.repository.config.EnableJdbcAuditing; /** diff --git a/src/main/java/org/springframework/data/jdbc/mybatis/MyBatisDataAccessStrategy.java b/src/main/java/org/springframework/data/jdbc/mybatis/MyBatisDataAccessStrategy.java index 5c8f4b2a..65a26d01 100644 --- a/src/main/java/org/springframework/data/jdbc/mybatis/MyBatisDataAccessStrategy.java +++ b/src/main/java/org/springframework/data/jdbc/mybatis/MyBatisDataAccessStrategy.java @@ -27,8 +27,8 @@ import org.springframework.data.jdbc.core.DataAccessStrategy; import org.springframework.data.jdbc.core.DefaultDataAccessStrategy; import org.springframework.data.jdbc.core.DelegatingDataAccessStrategy; import org.springframework.data.jdbc.core.SqlGeneratorSource; -import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext; -import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentProperty; +import org.springframework.data.jdbc.core.mapping.JdbcMappingContext; +import org.springframework.data.jdbc.core.mapping.JdbcPersistentProperty; import org.springframework.data.mapping.PropertyPath; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations; import org.springframework.util.Assert; diff --git a/src/main/java/org/springframework/data/jdbc/repository/config/JdbcConfiguration.java b/src/main/java/org/springframework/data/jdbc/repository/config/JdbcConfiguration.java index 8f9f3bfb..1a28b3dc 100644 --- a/src/main/java/org/springframework/data/jdbc/repository/config/JdbcConfiguration.java +++ b/src/main/java/org/springframework/data/jdbc/repository/config/JdbcConfiguration.java @@ -19,9 +19,9 @@ import java.util.Optional; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.data.jdbc.core.mapping.model.ConversionCustomizer; -import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext; -import org.springframework.data.jdbc.core.mapping.model.NamingStrategy; +import org.springframework.data.jdbc.core.mapping.ConversionCustomizer; +import org.springframework.data.jdbc.core.mapping.JdbcMappingContext; +import org.springframework.data.jdbc.core.mapping.NamingStrategy; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; diff --git a/src/main/java/org/springframework/data/jdbc/repository/support/JdbcQueryLookupStrategy.java b/src/main/java/org/springframework/data/jdbc/repository/support/JdbcQueryLookupStrategy.java index d34037f9..346d0dc5 100644 --- a/src/main/java/org/springframework/data/jdbc/repository/support/JdbcQueryLookupStrategy.java +++ b/src/main/java/org/springframework/data/jdbc/repository/support/JdbcQueryLookupStrategy.java @@ -20,7 +20,7 @@ import java.lang.reflect.Method; import org.springframework.core.convert.ConversionService; import org.springframework.data.jdbc.core.DataAccessStrategy; import org.springframework.data.jdbc.core.EntityRowMapper; -import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext; +import org.springframework.data.jdbc.core.mapping.JdbcMappingContext; import org.springframework.data.jdbc.repository.RowMapperMap; import org.springframework.data.projection.ProjectionFactory; import org.springframework.data.repository.core.NamedQueries; diff --git a/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactory.java b/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactory.java index 809e2484..d9e6c666 100644 --- a/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactory.java +++ b/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactory.java @@ -20,8 +20,8 @@ import java.util.Optional; import org.springframework.context.ApplicationEventPublisher; import org.springframework.data.jdbc.core.DataAccessStrategy; import org.springframework.data.jdbc.core.JdbcAggregateTemplate; -import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext; -import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentEntityInformation; +import org.springframework.data.jdbc.core.mapping.JdbcMappingContext; +import org.springframework.data.jdbc.core.mapping.JdbcPersistentEntityInformation; import org.springframework.data.jdbc.repository.RowMapperMap; import org.springframework.data.repository.core.EntityInformation; import org.springframework.data.repository.core.RepositoryInformation; diff --git a/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactoryBean.java b/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactoryBean.java index 940abd82..95c8ccd1 100644 --- a/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactoryBean.java +++ b/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactoryBean.java @@ -23,7 +23,7 @@ import org.springframework.context.ApplicationEventPublisherAware; import org.springframework.data.jdbc.core.DataAccessStrategy; import org.springframework.data.jdbc.core.DefaultDataAccessStrategy; import org.springframework.data.jdbc.core.SqlGeneratorSource; -import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext; +import org.springframework.data.jdbc.core.mapping.JdbcMappingContext; import org.springframework.data.jdbc.repository.RowMapperMap; import org.springframework.data.repository.Repository; import org.springframework.data.repository.core.support.RepositoryFactorySupport; diff --git a/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryQuery.java b/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryQuery.java index 929d4f44..153aefaf 100644 --- a/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryQuery.java +++ b/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryQuery.java @@ -17,7 +17,7 @@ package org.springframework.data.jdbc.repository.support; import org.springframework.beans.BeanUtils; import org.springframework.dao.EmptyResultDataAccessException; -import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext; +import org.springframework.data.jdbc.core.mapping.JdbcMappingContext; import org.springframework.data.repository.query.RepositoryQuery; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; diff --git a/src/main/java/org/springframework/data/jdbc/repository/support/SimpleJdbcRepository.java b/src/main/java/org/springframework/data/jdbc/repository/support/SimpleJdbcRepository.java index 95c19c9e..5003be41 100644 --- a/src/main/java/org/springframework/data/jdbc/repository/support/SimpleJdbcRepository.java +++ b/src/main/java/org/springframework/data/jdbc/repository/support/SimpleJdbcRepository.java @@ -23,7 +23,7 @@ import java.util.List; import java.util.Optional; import org.springframework.data.jdbc.core.JdbcAggregateOperations; -import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentEntityInformation; +import org.springframework.data.jdbc.core.mapping.JdbcPersistentEntityInformation; import org.springframework.data.repository.CrudRepository; /** @@ -34,19 +34,8 @@ import org.springframework.data.repository.CrudRepository; @RequiredArgsConstructor public class SimpleJdbcRepository implements CrudRepository { - private final JdbcPersistentEntityInformation entityInformation; - - private final JdbcAggregateOperations entityOperations; - - /** - * Creates a new {@link SimpleJdbcRepository}. - */ - public SimpleJdbcRepository(JdbcAggregateTemplate entityOperations, - JdbcPersistentEntityInformation entityInformation) { - - this.entityOperations = entityOperations; - this.entityInformation = entityInformation; - } + private final @NonNull JdbcAggregateOperations entityOperations; + private final @NonNull JdbcPersistentEntityInformation entityInformation; /* * (non-Javadoc) diff --git a/src/test/java/org/springframework/data/jdbc/core/CascadingDataAccessStrategyUnitTests.java b/src/test/java/org/springframework/data/jdbc/core/CascadingDataAccessStrategyUnitTests.java index 7061bfd6..b58788dd 100644 --- a/src/test/java/org/springframework/data/jdbc/core/CascadingDataAccessStrategyUnitTests.java +++ b/src/test/java/org/springframework/data/jdbc/core/CascadingDataAccessStrategyUnitTests.java @@ -25,7 +25,7 @@ import java.util.Collections; import org.junit.Test; import org.springframework.data.jdbc.core.FunctionCollector.CombinedDataAccessException; -import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentProperty; +import org.springframework.data.jdbc.core.mapping.JdbcPersistentProperty; /** * Unit tests for {@link CascadingDataAccessStrategy}. diff --git a/src/test/java/org/springframework/data/jdbc/core/DefaultDataAccessStrategyUnitTests.java b/src/test/java/org/springframework/data/jdbc/core/DefaultDataAccessStrategyUnitTests.java index cfe017a4..c21a5767 100644 --- a/src/test/java/org/springframework/data/jdbc/core/DefaultDataAccessStrategyUnitTests.java +++ b/src/test/java/org/springframework/data/jdbc/core/DefaultDataAccessStrategyUnitTests.java @@ -26,8 +26,8 @@ import java.util.HashMap; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.springframework.data.annotation.Id; -import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext; -import org.springframework.data.jdbc.core.mapping.model.NamingStrategy; +import org.springframework.data.jdbc.core.mapping.JdbcMappingContext; +import org.springframework.data.jdbc.core.mapping.NamingStrategy; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations; import org.springframework.jdbc.core.namedparam.SqlParameterSource; import org.springframework.jdbc.support.KeyHolder; diff --git a/src/test/java/org/springframework/data/jdbc/core/DefaultJdbcInterpreterUnitTests.java b/src/test/java/org/springframework/data/jdbc/core/DefaultJdbcInterpreterUnitTests.java index 714e9ee8..e97ec4f8 100644 --- a/src/test/java/org/springframework/data/jdbc/core/DefaultJdbcInterpreterUnitTests.java +++ b/src/test/java/org/springframework/data/jdbc/core/DefaultJdbcInterpreterUnitTests.java @@ -27,10 +27,10 @@ import org.mockito.ArgumentCaptor; import org.springframework.data.annotation.Id; import org.springframework.data.jdbc.core.conversion.DbAction; import org.springframework.data.jdbc.core.conversion.DbAction.Insert; +import org.springframework.data.jdbc.core.mapping.JdbcMappingContext; +import org.springframework.data.jdbc.core.mapping.JdbcPersistentProperty; +import org.springframework.data.jdbc.core.mapping.NamingStrategy; import org.springframework.data.jdbc.core.conversion.JdbcPropertyPath; -import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext; -import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentProperty; -import org.springframework.data.jdbc.core.mapping.model.NamingStrategy; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations; /** diff --git a/src/test/java/org/springframework/data/jdbc/core/EntityRowMapperUnitTests.java b/src/test/java/org/springframework/data/jdbc/core/EntityRowMapperUnitTests.java index c4fcfb10..159a6dfe 100644 --- a/src/test/java/org/springframework/data/jdbc/core/EntityRowMapperUnitTests.java +++ b/src/test/java/org/springframework/data/jdbc/core/EntityRowMapperUnitTests.java @@ -41,10 +41,10 @@ import org.springframework.core.convert.support.DefaultConversionService; import org.springframework.core.convert.support.GenericConversionService; import org.springframework.data.annotation.Id; import org.springframework.data.convert.Jsr310Converters; -import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext; -import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentEntity; -import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentProperty; -import org.springframework.data.jdbc.core.mapping.model.NamingStrategy; +import org.springframework.data.jdbc.core.mapping.JdbcMappingContext; +import org.springframework.data.jdbc.core.mapping.JdbcPersistentEntity; +import org.springframework.data.jdbc.core.mapping.JdbcPersistentProperty; +import org.springframework.data.jdbc.core.mapping.NamingStrategy; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations; import org.springframework.util.Assert; diff --git a/src/test/java/org/springframework/data/jdbc/core/JdbcEntityTemplateIntegrationTests.java b/src/test/java/org/springframework/data/jdbc/core/JdbcEntityTemplateIntegrationTests.java index f0e7877f..cbcc45cd 100644 --- a/src/test/java/org/springframework/data/jdbc/core/JdbcEntityTemplateIntegrationTests.java +++ b/src/test/java/org/springframework/data/jdbc/core/JdbcEntityTemplateIntegrationTests.java @@ -31,7 +31,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.data.annotation.Id; -import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext; +import org.springframework.data.jdbc.core.mapping.JdbcMappingContext; import org.springframework.data.jdbc.testing.TestConfiguration; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.rules.SpringClassRule; diff --git a/src/test/java/org/springframework/data/jdbc/core/MyBatisDataAccessStrategyUnitTests.java b/src/test/java/org/springframework/data/jdbc/core/MyBatisDataAccessStrategyUnitTests.java index 99817748..8908c70a 100644 --- a/src/test/java/org/springframework/data/jdbc/core/MyBatisDataAccessStrategyUnitTests.java +++ b/src/test/java/org/springframework/data/jdbc/core/MyBatisDataAccessStrategyUnitTests.java @@ -27,7 +27,7 @@ import org.junit.Before; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; -import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentProperty; +import org.springframework.data.jdbc.core.mapping.JdbcPersistentProperty; import org.springframework.data.jdbc.mybatis.MyBatisContext; import org.springframework.data.jdbc.mybatis.MyBatisDataAccessStrategy; import org.springframework.data.mapping.PropertyPath; diff --git a/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorContextBasedNamingStrategyUnitTests.java b/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorContextBasedNamingStrategyUnitTests.java index a40f8465..3d18a82a 100644 --- a/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorContextBasedNamingStrategyUnitTests.java +++ b/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorContextBasedNamingStrategyUnitTests.java @@ -24,9 +24,9 @@ import java.util.function.Consumer; import org.assertj.core.api.SoftAssertions; import org.junit.Test; import org.springframework.data.annotation.Id; -import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext; -import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentEntity; -import org.springframework.data.jdbc.core.mapping.model.NamingStrategy; +import org.springframework.data.jdbc.core.mapping.JdbcMappingContext; +import org.springframework.data.jdbc.core.mapping.JdbcPersistentEntity; +import org.springframework.data.jdbc.core.mapping.NamingStrategy; import org.springframework.data.mapping.PropertyPath; /** diff --git a/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorFixedNamingStrategyUnitTests.java b/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorFixedNamingStrategyUnitTests.java index 07c81d59..9430673f 100644 --- a/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorFixedNamingStrategyUnitTests.java +++ b/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorFixedNamingStrategyUnitTests.java @@ -20,10 +20,10 @@ import static org.assertj.core.api.Assertions.*; import org.assertj.core.api.SoftAssertions; import org.junit.Test; import org.springframework.data.annotation.Id; -import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext; -import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentEntity; -import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentProperty; -import org.springframework.data.jdbc.core.mapping.model.NamingStrategy; +import org.springframework.data.jdbc.core.mapping.JdbcMappingContext; +import org.springframework.data.jdbc.core.mapping.JdbcPersistentEntity; +import org.springframework.data.jdbc.core.mapping.JdbcPersistentProperty; +import org.springframework.data.jdbc.core.mapping.NamingStrategy; import org.springframework.data.mapping.PropertyPath; /** diff --git a/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorUnitTests.java b/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorUnitTests.java index 97b627e8..8a842977 100644 --- a/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorUnitTests.java +++ b/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorUnitTests.java @@ -24,10 +24,10 @@ import org.assertj.core.api.SoftAssertions; import org.junit.Before; import org.junit.Test; import org.springframework.data.annotation.Id; -import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext; -import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentEntity; -import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentProperty; -import org.springframework.data.jdbc.core.mapping.model.NamingStrategy; +import org.springframework.data.jdbc.core.mapping.JdbcMappingContext; +import org.springframework.data.jdbc.core.mapping.JdbcPersistentEntity; +import org.springframework.data.jdbc.core.mapping.JdbcPersistentProperty; +import org.springframework.data.jdbc.core.mapping.NamingStrategy; import org.springframework.data.mapping.PropertyPath; /** diff --git a/src/test/java/org/springframework/data/jdbc/core/conversion/JdbcEntityDeleteWriterUnitTests.java b/src/test/java/org/springframework/data/jdbc/core/conversion/JdbcEntityDeleteWriterUnitTests.java index 2f415dc5..beed9159 100644 --- a/src/test/java/org/springframework/data/jdbc/core/conversion/JdbcEntityDeleteWriterUnitTests.java +++ b/src/test/java/org/springframework/data/jdbc/core/conversion/JdbcEntityDeleteWriterUnitTests.java @@ -25,7 +25,7 @@ import org.mockito.junit.MockitoJUnitRunner; import org.springframework.data.annotation.Id; import org.springframework.data.jdbc.core.conversion.AggregateChange.Kind; import org.springframework.data.jdbc.core.conversion.DbAction.Delete; -import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext; +import org.springframework.data.jdbc.core.mapping.JdbcMappingContext; /** * Unit tests for the {@link JdbcEntityDeleteWriter} diff --git a/src/test/java/org/springframework/data/jdbc/core/conversion/JdbcEntityWriterUnitTests.java b/src/test/java/org/springframework/data/jdbc/core/conversion/JdbcEntityWriterUnitTests.java index c2b35425..8acb5c14 100644 --- a/src/test/java/org/springframework/data/jdbc/core/conversion/JdbcEntityWriterUnitTests.java +++ b/src/test/java/org/springframework/data/jdbc/core/conversion/JdbcEntityWriterUnitTests.java @@ -34,7 +34,7 @@ import org.springframework.data.jdbc.core.conversion.AggregateChange.Kind; import org.springframework.data.jdbc.core.conversion.DbAction.Delete; import org.springframework.data.jdbc.core.conversion.DbAction.Insert; import org.springframework.data.jdbc.core.conversion.DbAction.Update; -import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext; +import org.springframework.data.jdbc.core.mapping.JdbcMappingContext; /** * Unit tests for the {@link JdbcEntityWriter} diff --git a/src/test/java/org/springframework/data/jdbc/core/mapping/model/BasicJdbcPersistentEntityInformationUnitTests.java b/src/test/java/org/springframework/data/jdbc/core/mapping/BasicJdbcPersistentEntityInformationUnitTests.java similarity index 92% rename from src/test/java/org/springframework/data/jdbc/core/mapping/model/BasicJdbcPersistentEntityInformationUnitTests.java rename to src/test/java/org/springframework/data/jdbc/core/mapping/BasicJdbcPersistentEntityInformationUnitTests.java index 7d23de0f..2c39cbdc 100644 --- a/src/test/java/org/springframework/data/jdbc/core/mapping/model/BasicJdbcPersistentEntityInformationUnitTests.java +++ b/src/test/java/org/springframework/data/jdbc/core/mapping/BasicJdbcPersistentEntityInformationUnitTests.java @@ -13,13 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.jdbc.core.mapping.model; +package org.springframework.data.jdbc.core.mapping; import static org.assertj.core.api.Assertions.*; import org.junit.Test; import org.springframework.data.annotation.Id; import org.springframework.data.domain.Persistable; +import org.springframework.data.jdbc.core.mapping.BasicJdbcPersistentEntityInformation; +import org.springframework.data.jdbc.core.mapping.JdbcMappingContext; import org.springframework.lang.Nullable; /** diff --git a/src/test/java/org/springframework/data/jdbc/core/mapping/model/BasicJdbcPersistentPropertyUnitTests.java b/src/test/java/org/springframework/data/jdbc/core/mapping/BasicJdbcPersistentPropertyUnitTests.java similarity index 85% rename from src/test/java/org/springframework/data/jdbc/core/mapping/model/BasicJdbcPersistentPropertyUnitTests.java rename to src/test/java/org/springframework/data/jdbc/core/mapping/BasicJdbcPersistentPropertyUnitTests.java index feb28e14..0177771f 100644 --- a/src/test/java/org/springframework/data/jdbc/core/mapping/model/BasicJdbcPersistentPropertyUnitTests.java +++ b/src/test/java/org/springframework/data/jdbc/core/mapping/BasicJdbcPersistentPropertyUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.jdbc.core.mapping.model; +package org.springframework.data.jdbc.core.mapping; import static org.assertj.core.api.Assertions.*; @@ -24,6 +24,11 @@ import java.time.ZonedDateTime; import java.util.Date; import org.junit.Test; +import org.springframework.data.jdbc.core.mapping.BasicJdbcPersistentProperty; +import org.springframework.data.jdbc.core.mapping.Column; +import org.springframework.data.jdbc.core.mapping.JdbcMappingContext; +import org.springframework.data.jdbc.core.mapping.JdbcPersistentEntity; +import org.springframework.data.jdbc.core.mapping.JdbcPersistentProperty; import org.springframework.data.mapping.PropertyHandler; /** diff --git a/src/test/java/org/springframework/data/jdbc/core/mapping/model/DelimiterNamingStrategyUnitTests.java b/src/test/java/org/springframework/data/jdbc/core/mapping/DelimiterNamingStrategyUnitTests.java similarity index 90% rename from src/test/java/org/springframework/data/jdbc/core/mapping/model/DelimiterNamingStrategyUnitTests.java rename to src/test/java/org/springframework/data/jdbc/core/mapping/DelimiterNamingStrategyUnitTests.java index eabf42c8..8a67f011 100644 --- a/src/test/java/org/springframework/data/jdbc/core/mapping/model/DelimiterNamingStrategyUnitTests.java +++ b/src/test/java/org/springframework/data/jdbc/core/mapping/DelimiterNamingStrategyUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.jdbc.core.mapping.model; +package org.springframework.data.jdbc.core.mapping; import static org.assertj.core.api.Assertions.*; @@ -24,6 +24,9 @@ import java.util.List; import org.junit.Test; import org.springframework.data.annotation.Id; +import org.springframework.data.jdbc.core.mapping.DelimiterNamingStrategy; +import org.springframework.data.jdbc.core.mapping.JdbcMappingContext; +import org.springframework.data.jdbc.core.mapping.JdbcPersistentEntity; /** * Unit tests for the {@link DelimiterNamingStrategy}. diff --git a/src/test/java/org/springframework/data/jdbc/core/mapping/model/JdbcMappingContextUnitTests.java b/src/test/java/org/springframework/data/jdbc/core/mapping/JdbcMappingContextUnitTests.java similarity index 93% rename from src/test/java/org/springframework/data/jdbc/core/mapping/model/JdbcMappingContextUnitTests.java rename to src/test/java/org/springframework/data/jdbc/core/mapping/JdbcMappingContextUnitTests.java index 2094a37e..d61ad7bb 100644 --- a/src/test/java/org/springframework/data/jdbc/core/mapping/model/JdbcMappingContextUnitTests.java +++ b/src/test/java/org/springframework/data/jdbc/core/mapping/JdbcMappingContextUnitTests.java @@ -13,13 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.jdbc.core.mapping.model; +package org.springframework.data.jdbc.core.mapping; import static org.assertj.core.api.Assertions.*; import java.util.List; import org.junit.Test; +import org.springframework.data.jdbc.core.mapping.JdbcMappingContext; import org.springframework.data.mapping.PropertyPath; /** diff --git a/src/test/java/org/springframework/data/jdbc/mapping/model/JdbcPersistentEntityImplUnitTests.java b/src/test/java/org/springframework/data/jdbc/core/mapping/JdbcPersistentEntityImplUnitTests.java similarity index 78% rename from src/test/java/org/springframework/data/jdbc/mapping/model/JdbcPersistentEntityImplUnitTests.java rename to src/test/java/org/springframework/data/jdbc/core/mapping/JdbcPersistentEntityImplUnitTests.java index b316119a..d2d74f54 100644 --- a/src/test/java/org/springframework/data/jdbc/mapping/model/JdbcPersistentEntityImplUnitTests.java +++ b/src/test/java/org/springframework/data/jdbc/core/mapping/JdbcPersistentEntityImplUnitTests.java @@ -13,11 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.jdbc.mapping.model; +package org.springframework.data.jdbc.core.mapping; import static org.assertj.core.api.Assertions.*; import org.junit.Test; +import org.springframework.data.jdbc.core.mapping.JdbcMappingContext; +import org.springframework.data.jdbc.core.mapping.JdbcPersistentEntity; +import org.springframework.data.jdbc.core.mapping.JdbcPersistentEntityImpl; +import org.springframework.data.jdbc.core.mapping.Table; /** * Unit tests for {@link JdbcPersistentEntityImpl}. diff --git a/src/test/java/org/springframework/data/jdbc/mapping/model/NamingStrategyUnitTests.java b/src/test/java/org/springframework/data/jdbc/core/mapping/NamingStrategyUnitTests.java similarity index 88% rename from src/test/java/org/springframework/data/jdbc/mapping/model/NamingStrategyUnitTests.java rename to src/test/java/org/springframework/data/jdbc/core/mapping/NamingStrategyUnitTests.java index 600a0856..ba3dfdb2 100644 --- a/src/test/java/org/springframework/data/jdbc/mapping/model/NamingStrategyUnitTests.java +++ b/src/test/java/org/springframework/data/jdbc/core/mapping/NamingStrategyUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.jdbc.mapping.model; +package org.springframework.data.jdbc.core.mapping; import static org.assertj.core.api.Assertions.*; @@ -22,7 +22,10 @@ import java.util.List; import org.junit.Test; import org.springframework.data.annotation.Id; -import org.springframework.data.jdbc.mapping.model.JdbcPersistentEntityImplUnitTests.DummySubEntity; +import org.springframework.data.jdbc.core.mapping.JdbcMappingContext; +import org.springframework.data.jdbc.core.mapping.JdbcPersistentEntity; +import org.springframework.data.jdbc.core.mapping.NamingStrategy; +import org.springframework.data.jdbc.core.mapping.JdbcPersistentEntityImplUnitTests.DummySubEntity; /** * Unit tests for the {@link NamingStrategy}. diff --git a/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisHsqlIntegrationTests.java b/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisHsqlIntegrationTests.java index edf59b68..491af56b 100644 --- a/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisHsqlIntegrationTests.java +++ b/src/test/java/org/springframework/data/jdbc/mybatis/MyBatisHsqlIntegrationTests.java @@ -31,7 +31,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Import; import org.springframework.data.jdbc.core.DataAccessStrategy; -import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext; +import org.springframework.data.jdbc.core.mapping.JdbcMappingContext; import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories; import org.springframework.data.jdbc.testing.TestConfiguration; import org.springframework.data.repository.CrudRepository; diff --git a/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryIdGenerationIntegrationTests.java b/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryIdGenerationIntegrationTests.java index 3d1351ed..8661f81c 100644 --- a/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryIdGenerationIntegrationTests.java +++ b/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryIdGenerationIntegrationTests.java @@ -29,7 +29,7 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.data.annotation.Id; -import org.springframework.data.jdbc.core.mapping.model.NamingStrategy; +import org.springframework.data.jdbc.core.mapping.NamingStrategy; import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories; import org.springframework.data.jdbc.repository.support.JdbcRepositoryFactory; import org.springframework.data.jdbc.repository.support.SimpleJdbcRepository; diff --git a/src/test/java/org/springframework/data/jdbc/repository/SimpleJdbcRepositoryEventsUnitTests.java b/src/test/java/org/springframework/data/jdbc/repository/SimpleJdbcRepositoryEventsUnitTests.java index 4bfadb99..a90d62da 100644 --- a/src/test/java/org/springframework/data/jdbc/repository/SimpleJdbcRepositoryEventsUnitTests.java +++ b/src/test/java/org/springframework/data/jdbc/repository/SimpleJdbcRepositoryEventsUnitTests.java @@ -36,6 +36,7 @@ import org.springframework.context.ApplicationEventPublisher; import org.springframework.data.annotation.Id; import org.springframework.data.jdbc.core.DefaultDataAccessStrategy; import org.springframework.data.jdbc.core.SqlGeneratorSource; +import org.springframework.data.jdbc.core.mapping.JdbcMappingContext; import org.springframework.data.jdbc.core.mapping.event.AfterDeleteEvent; import org.springframework.data.jdbc.core.mapping.event.AfterLoadEvent; import org.springframework.data.jdbc.core.mapping.event.AfterSaveEvent; @@ -43,7 +44,6 @@ import org.springframework.data.jdbc.core.mapping.event.BeforeDeleteEvent; import org.springframework.data.jdbc.core.mapping.event.BeforeSaveEvent; import org.springframework.data.jdbc.core.mapping.event.Identifier; import org.springframework.data.jdbc.core.mapping.event.JdbcEvent; -import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext; import org.springframework.data.jdbc.repository.support.JdbcRepositoryFactory; import org.springframework.data.jdbc.repository.support.SimpleJdbcRepository; import org.springframework.data.repository.CrudRepository; diff --git a/src/test/java/org/springframework/data/jdbc/repository/config/EnableJdbcAuditingHsqlIntegrationTests.java b/src/test/java/org/springframework/data/jdbc/repository/config/EnableJdbcAuditingHsqlIntegrationTests.java index 08e9b638..e4a1c801 100644 --- a/src/test/java/org/springframework/data/jdbc/repository/config/EnableJdbcAuditingHsqlIntegrationTests.java +++ b/src/test/java/org/springframework/data/jdbc/repository/config/EnableJdbcAuditingHsqlIntegrationTests.java @@ -39,7 +39,7 @@ import org.springframework.data.annotation.LastModifiedBy; import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.auditing.DateTimeProvider; import org.springframework.data.domain.AuditorAware; -import org.springframework.data.jdbc.core.mapping.model.NamingStrategy; +import org.springframework.data.jdbc.core.mapping.NamingStrategy; import org.springframework.data.repository.CrudRepository; /** diff --git a/src/test/java/org/springframework/data/jdbc/repository/support/JdbcQueryLookupStrategyUnitTests.java b/src/test/java/org/springframework/data/jdbc/repository/support/JdbcQueryLookupStrategyUnitTests.java index 3b7d8d3f..8e872cd3 100644 --- a/src/test/java/org/springframework/data/jdbc/repository/support/JdbcQueryLookupStrategyUnitTests.java +++ b/src/test/java/org/springframework/data/jdbc/repository/support/JdbcQueryLookupStrategyUnitTests.java @@ -24,7 +24,7 @@ import java.text.NumberFormat; import org.junit.Before; import org.junit.Test; import org.springframework.data.jdbc.core.DataAccessStrategy; -import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext; +import org.springframework.data.jdbc.core.mapping.JdbcMappingContext; import org.springframework.data.jdbc.repository.RowMapperMap; import org.springframework.data.jdbc.repository.config.ConfigurableRowMapperMap; import org.springframework.data.jdbc.repository.query.Query; diff --git a/src/test/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactoryBeanUnitTests.java b/src/test/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactoryBeanUnitTests.java index cdce7a9b..8830b5aa 100644 --- a/src/test/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactoryBeanUnitTests.java +++ b/src/test/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactoryBeanUnitTests.java @@ -28,7 +28,7 @@ import org.springframework.context.ApplicationEventPublisher; import org.springframework.data.annotation.Id; import org.springframework.data.jdbc.core.DataAccessStrategy; import org.springframework.data.jdbc.core.DefaultDataAccessStrategy; -import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext; +import org.springframework.data.jdbc.core.mapping.JdbcMappingContext; import org.springframework.data.jdbc.repository.RowMapperMap; import org.springframework.data.repository.CrudRepository; import org.springframework.test.util.ReflectionTestUtils; diff --git a/src/test/java/org/springframework/data/jdbc/testing/TestConfiguration.java b/src/test/java/org/springframework/data/jdbc/testing/TestConfiguration.java index e47915e5..8d03ff3c 100644 --- a/src/test/java/org/springframework/data/jdbc/testing/TestConfiguration.java +++ b/src/test/java/org/springframework/data/jdbc/testing/TestConfiguration.java @@ -28,9 +28,9 @@ import org.springframework.context.annotation.Configuration; import org.springframework.data.jdbc.core.DataAccessStrategy; import org.springframework.data.jdbc.core.DefaultDataAccessStrategy; import org.springframework.data.jdbc.core.SqlGeneratorSource; -import org.springframework.data.jdbc.core.mapping.model.ConversionCustomizer; -import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext; -import org.springframework.data.jdbc.core.mapping.model.NamingStrategy; +import org.springframework.data.jdbc.core.mapping.ConversionCustomizer; +import org.springframework.data.jdbc.core.mapping.JdbcMappingContext; +import org.springframework.data.jdbc.core.mapping.NamingStrategy; import org.springframework.data.jdbc.repository.support.JdbcRepositoryFactory; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;