From eb8d7f7d004d504f3c40ef8f46cc7d85ee195a7f Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Thu, 19 Apr 2018 09:56:45 +0200 Subject: [PATCH 1/2] DATAJDBC-138 - Prepare Branch. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8250763cae..df954b1f91 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-jdbc - 1.0.0.BUILD-SNAPSHOT + 1.0.0.DATAJDBC-138-SNAPSHOT Spring Data JDBC Spring Data module for JDBC repositories. From afc2cf51383524b16a1eb73dd796aed7f786566a Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Thu, 19 Apr 2018 10:00:15 +0200 Subject: [PATCH 2/2] DATAJDBC-138 - Improve package structure and naming. Moved SimpleJdbcRepository into support package. Moved mapping package under core. Renamed JdbcEntityOperations to JdbcAggregateOperations. --- .../core/CascadingDataAccessStrategy.java | 2 +- .../data/jdbc/core/DataAccessStrategy.java | 4 +-- .../jdbc/core/DefaultDataAccessStrategy.java | 10 +++---- .../jdbc/core/DefaultJdbcInterpreter.java | 4 +-- .../core/DelegatingDataAccessStrategy.java | 2 +- .../data/jdbc/core/EntityRowMapper.java | 6 ++--- ...ions.java => JdbcAggregateOperations.java} | 2 +- ...mplate.java => JdbcAggregateTemplate.java} | 26 +++++++++---------- .../data/jdbc/core/SelectBuilder.java | 2 +- .../data/jdbc/core/SqlGenerator.java | 8 +++--- .../data/jdbc/core/SqlGeneratorSource.java | 2 +- .../conversion/JdbcEntityDeleteWriter.java | 2 +- .../core/conversion/JdbcEntityWriter.java | 8 +++--- .../conversion/JdbcEntityWriterSupport.java | 2 +- .../mapping/event/AfterDeleteEvent.java | 4 +-- .../mapping/event/AfterLoadEvent.java | 4 +-- .../mapping/event/AfterSaveEvent.java | 4 +-- .../mapping/event/BeforeDeleteEvent.java | 4 +-- .../mapping/event/BeforeSaveEvent.java | 2 +- .../{ => core}/mapping/event/Identifier.java | 2 +- .../{ => core}/mapping/event/JdbcEvent.java | 2 +- .../mapping/event/JdbcEventWithEntity.java | 2 +- .../mapping/event/JdbcEventWithId.java | 6 ++--- .../event/JdbcEventWithIdAndEntity.java | 4 +-- .../mapping/event/SimpleJdbcEvent.java | 6 ++--- .../mapping/event/SpecifiedIdentifier.java | 6 ++--- .../jdbc/{ => core}/mapping/event/Unset.java | 4 +-- .../{ => core}/mapping/event/WithEntity.java | 2 +- .../jdbc/{ => core}/mapping/event/WithId.java | 4 +-- .../BasicJdbcPersistentEntityInformation.java | 4 +-- .../model/BasicJdbcPersistentProperty.java | 4 +-- .../mapping/model/ConversionCustomizer.java | 2 +- .../model/DelimiterNamingStrategy.java | 2 +- .../mapping/model/JdbcMappingContext.java | 2 +- .../mapping/model/JdbcPersistentEntity.java | 2 +- .../model/JdbcPersistentEntityImpl.java | 4 +-- .../JdbcPersistentEntityInformation.java | 2 +- .../mapping/model/JdbcPersistentProperty.java | 2 +- .../mapping/model/NamingStrategy.java | 2 +- .../support/JdbcAuditingEventListener.java | 2 +- .../mybatis/MyBatisDataAccessStrategy.java | 4 +-- .../repository/config/JdbcConfiguration.java | 6 ++--- .../support/JdbcQueryLookupStrategy.java | 2 +- .../support/JdbcRepositoryFactory.java | 9 +++---- .../support/JdbcRepositoryFactoryBean.java | 2 +- .../support/JdbcRepositoryQuery.java | 2 +- .../{ => support}/SimpleJdbcRepository.java | 12 ++++----- .../CascadingDataAccessStrategyUnitTests.java | 2 +- .../DefaultDataAccessStrategyUnitTests.java | 4 +-- .../core/DefaultJdbcInterpreterUnitTests.java | 6 ++--- .../jdbc/core/EntityRowMapperUnitTests.java | 8 +++--- .../JdbcEntityTemplateIntegrationTests.java | 11 ++++---- .../MyBatisDataAccessStrategyUnitTests.java | 2 +- ...orContextBasedNamingStrategyUnitTests.java | 6 ++--- ...GeneratorFixedNamingStrategyUnitTests.java | 8 +++--- .../data/jdbc/core/SqlGeneratorUnitTests.java | 8 +++--- .../JdbcEntityDeleteWriterUnitTests.java | 2 +- .../conversion/JdbcEntityWriterUnitTests.java | 2 +- ...cPersistentEntityInformationUnitTests.java | 2 +- .../BasicJdbcPersistentPropertyUnitTests.java | 2 +- .../DelimiterNamingStrategyUnitTests.java | 2 +- .../model/JdbcMappingContextUnitTests.java | 2 +- .../mybatis/MyBatisHsqlIntegrationTests.java | 2 +- ...epositoryIdGenerationIntegrationTests.java | 3 ++- ...ryManipulateDbActionsIntegrationTests.java | 4 +-- ...oryPropertyConversionIntegrationTests.java | 2 +- .../SimpleJdbcRepositoryEventsUnitTests.java | 17 ++++++------ ...nableJdbcAuditingHsqlIntegrationTests.java | 2 +- .../JdbcQueryLookupStrategyUnitTests.java | 2 +- .../JdbcRepositoryFactoryBeanUnitTests.java | 2 +- .../support/JdbcRepositoryQueryUnitTests.java | 2 +- .../data/jdbc/testing/TestConfiguration.java | 6 ++--- 72 files changed, 156 insertions(+), 154 deletions(-) rename src/main/java/org/springframework/data/jdbc/core/{JdbcEntityOperations.java => JdbcAggregateOperations.java} (96%) rename src/main/java/org/springframework/data/jdbc/core/{JdbcEntityTemplate.java => JdbcAggregateTemplate.java} (84%) rename src/main/java/org/springframework/data/jdbc/{ => core}/mapping/event/AfterDeleteEvent.java (91%) rename src/main/java/org/springframework/data/jdbc/{ => core}/mapping/event/AfterLoadEvent.java (89%) rename src/main/java/org/springframework/data/jdbc/{ => core}/mapping/event/AfterSaveEvent.java (90%) rename src/main/java/org/springframework/data/jdbc/{ => core}/mapping/event/BeforeDeleteEvent.java (90%) rename src/main/java/org/springframework/data/jdbc/{ => core}/mapping/event/BeforeSaveEvent.java (95%) rename src/main/java/org/springframework/data/jdbc/{ => core}/mapping/event/Identifier.java (97%) rename src/main/java/org/springframework/data/jdbc/{ => core}/mapping/event/JdbcEvent.java (94%) rename src/main/java/org/springframework/data/jdbc/{ => core}/mapping/event/JdbcEventWithEntity.java (95%) rename src/main/java/org/springframework/data/jdbc/{ => core}/mapping/event/JdbcEventWithId.java (85%) rename src/main/java/org/springframework/data/jdbc/{ => core}/mapping/event/JdbcEventWithIdAndEntity.java (89%) rename src/main/java/org/springframework/data/jdbc/{ => core}/mapping/event/SimpleJdbcEvent.java (88%) rename src/main/java/org/springframework/data/jdbc/{ => core}/mapping/event/SpecifiedIdentifier.java (82%) rename src/main/java/org/springframework/data/jdbc/{ => core}/mapping/event/Unset.java (86%) rename src/main/java/org/springframework/data/jdbc/{ => core}/mapping/event/WithEntity.java (94%) rename src/main/java/org/springframework/data/jdbc/{ => core}/mapping/event/WithId.java (87%) rename src/main/java/org/springframework/data/jdbc/{ => core}/mapping/model/BasicJdbcPersistentEntityInformation.java (90%) rename src/main/java/org/springframework/data/jdbc/{ => core}/mapping/model/BasicJdbcPersistentProperty.java (96%) 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 (92%) 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/repository/{ => support}/SimpleJdbcRepository.java (90%) rename src/test/java/org/springframework/data/jdbc/{ => core}/mapping/model/BasicJdbcPersistentEntityInformationUnitTests.java (98%) rename src/test/java/org/springframework/data/jdbc/{ => core}/mapping/model/BasicJdbcPersistentPropertyUnitTests.java (97%) rename src/test/java/org/springframework/data/jdbc/{ => core}/mapping/model/DelimiterNamingStrategyUnitTests.java (98%) rename src/test/java/org/springframework/data/jdbc/{ => core}/mapping/model/JdbcMappingContextUnitTests.java (97%) 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 1f394aa342..fadbe975a2 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.function.Consumer; import java.util.function.Function; -import org.springframework.data.jdbc.mapping.model.JdbcPersistentProperty; +import org.springframework.data.jdbc.core.mapping.model.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 501f1e5d8c..1a1eaaf4e8 100644 --- a/src/main/java/org/springframework/data/jdbc/core/DataAccessStrategy.java +++ b/src/main/java/org/springframework/data/jdbc/core/DataAccessStrategy.java @@ -17,11 +17,11 @@ import java.util.Map; -import org.springframework.data.jdbc.mapping.model.JdbcPersistentProperty; +import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentProperty; import org.springframework.data.mapping.PropertyPath; /** - * Abstraction for accesses to the database that should be implementable with a single SQL statement and relates to a single entity as opposed to {@link JdbcEntityOperations} which provides interactions related to complete aggregates. + * Abstraction for accesses to the database that should be implementable with a single SQL statement and relates to a single entity as opposed to {@link JdbcAggregateOperations} which provides interactions related to complete aggregates. * * @author Jens Schauder * @since 1.0 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 c7968e1513..924287a6e5 100644 --- a/src/main/java/org/springframework/data/jdbc/core/DefaultDataAccessStrategy.java +++ b/src/main/java/org/springframework/data/jdbc/core/DefaultDataAccessStrategy.java @@ -24,11 +24,11 @@ import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.dao.InvalidDataAccessApiUsageException; import org.springframework.dao.NonTransientDataAccessException; -import org.springframework.data.jdbc.mapping.model.BasicJdbcPersistentEntityInformation; -import org.springframework.data.jdbc.mapping.model.JdbcMappingContext; -import org.springframework.data.jdbc.mapping.model.JdbcPersistentEntity; -import org.springframework.data.jdbc.mapping.model.JdbcPersistentEntityInformation; -import org.springframework.data.jdbc.mapping.model.JdbcPersistentProperty; +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.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 de4482129f..bd1e9a0261 100644 --- a/src/main/java/org/springframework/data/jdbc/core/DefaultJdbcInterpreter.java +++ b/src/main/java/org/springframework/data/jdbc/core/DefaultJdbcInterpreter.java @@ -24,8 +24,8 @@ import org.springframework.data.jdbc.core.conversion.DbAction.Insert; import org.springframework.data.jdbc.core.conversion.DbAction.Update; import org.springframework.data.jdbc.core.conversion.Interpreter; -import org.springframework.data.jdbc.mapping.model.JdbcMappingContext; -import org.springframework.data.jdbc.mapping.model.JdbcPersistentEntity; +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 34e75a67b8..91a360b66e 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 @@ import java.util.Map; -import org.springframework.data.jdbc.mapping.model.JdbcPersistentProperty; +import org.springframework.data.jdbc.core.mapping.model.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 ff27675d56..7e4a5d0ec3 100644 --- a/src/main/java/org/springframework/data/jdbc/core/EntityRowMapper.java +++ b/src/main/java/org/springframework/data/jdbc/core/EntityRowMapper.java @@ -25,9 +25,9 @@ import org.springframework.core.convert.converter.Converter; import org.springframework.data.convert.ClassGeneratingEntityInstantiator; import org.springframework.data.convert.EntityInstantiator; -import org.springframework.data.jdbc.mapping.model.JdbcMappingContext; -import org.springframework.data.jdbc.mapping.model.JdbcPersistentEntity; -import org.springframework.data.jdbc.mapping.model.JdbcPersistentProperty; +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.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/JdbcEntityOperations.java b/src/main/java/org/springframework/data/jdbc/core/JdbcAggregateOperations.java similarity index 96% rename from src/main/java/org/springframework/data/jdbc/core/JdbcEntityOperations.java rename to src/main/java/org/springframework/data/jdbc/core/JdbcAggregateOperations.java index 944d7b33c6..2f8cb38cc8 100644 --- a/src/main/java/org/springframework/data/jdbc/core/JdbcEntityOperations.java +++ b/src/main/java/org/springframework/data/jdbc/core/JdbcAggregateOperations.java @@ -21,7 +21,7 @@ * @author Jens Schauder * @since 1.0 */ -public interface JdbcEntityOperations { +public interface JdbcAggregateOperations { void save(T instance, Class domainType); diff --git a/src/main/java/org/springframework/data/jdbc/core/JdbcEntityTemplate.java b/src/main/java/org/springframework/data/jdbc/core/JdbcAggregateTemplate.java similarity index 84% rename from src/main/java/org/springframework/data/jdbc/core/JdbcEntityTemplate.java rename to src/main/java/org/springframework/data/jdbc/core/JdbcAggregateTemplate.java index 928fb4b65e..853355addb 100644 --- a/src/main/java/org/springframework/data/jdbc/core/JdbcEntityTemplate.java +++ b/src/main/java/org/springframework/data/jdbc/core/JdbcAggregateTemplate.java @@ -23,24 +23,24 @@ 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.mapping.event.AfterDeleteEvent; -import org.springframework.data.jdbc.mapping.event.AfterLoadEvent; -import org.springframework.data.jdbc.mapping.event.AfterSaveEvent; -import org.springframework.data.jdbc.mapping.event.BeforeDeleteEvent; -import org.springframework.data.jdbc.mapping.event.BeforeSaveEvent; -import org.springframework.data.jdbc.mapping.event.Identifier; -import org.springframework.data.jdbc.mapping.event.Identifier.Specified; -import org.springframework.data.jdbc.mapping.model.JdbcMappingContext; -import org.springframework.data.jdbc.mapping.model.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; +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 JdbcEntityOperations} implementation, storing aggregates in and obtaining them from a JDBC data store. + * {@link JdbcAggregateOperations} implementation, storing aggregates in and obtaining them from a JDBC data store. * * @author Jens Schauder * @author Mark Paluch * @since 1.0 */ -public class JdbcEntityTemplate implements JdbcEntityOperations { +public class JdbcAggregateTemplate implements JdbcAggregateOperations { private final ApplicationEventPublisher publisher; private final JdbcMappingContext context; @@ -51,8 +51,8 @@ public class JdbcEntityTemplate implements JdbcEntityOperations { private final DataAccessStrategy accessStrategy; - public JdbcEntityTemplate(ApplicationEventPublisher publisher, JdbcMappingContext context, - DataAccessStrategy dataAccessStrategy) { + public JdbcAggregateTemplate(ApplicationEventPublisher publisher, JdbcMappingContext context, + DataAccessStrategy dataAccessStrategy) { this.publisher = publisher; this.context = context; diff --git a/src/main/java/org/springframework/data/jdbc/core/SelectBuilder.java b/src/main/java/org/springframework/data/jdbc/core/SelectBuilder.java index 25c8ffd89b..bd7f68fce8 100644 --- a/src/main/java/org/springframework/data/jdbc/core/SelectBuilder.java +++ b/src/main/java/org/springframework/data/jdbc/core/SelectBuilder.java @@ -24,7 +24,7 @@ /** * Builder for creating Select-statements. Not intended for general purpose, but only for the needs of the - * {@link JdbcEntityTemplate}. + * {@link JdbcAggregateTemplate}. * * @author Jens Schauder * @since 1.0 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 9e32d070e5..a78c9cc581 100644 --- a/src/main/java/org/springframework/data/jdbc/core/SqlGenerator.java +++ b/src/main/java/org/springframework/data/jdbc/core/SqlGenerator.java @@ -15,10 +15,10 @@ */ package org.springframework.data.jdbc.core; -import org.springframework.data.jdbc.mapping.model.JdbcMappingContext; -import org.springframework.data.jdbc.mapping.model.JdbcPersistentEntity; -import org.springframework.data.jdbc.mapping.model.JdbcPersistentProperty; -import org.springframework.data.jdbc.repository.SimpleJdbcRepository; +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.repository.support.SimpleJdbcRepository; import org.springframework.data.mapping.PropertyHandler; import org.springframework.data.mapping.PropertyPath; import org.springframework.data.util.Lazy; 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 d70c830f52..c32de536cc 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 java.util.HashMap; import java.util.Map; -import org.springframework.data.jdbc.mapping.model.JdbcMappingContext; +import org.springframework.data.jdbc.core.mapping.model.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 d73f93f20a..d6711e9f66 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.mapping.model.JdbcMappingContext; +import org.springframework.data.jdbc.core.mapping.model.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 4ce1c6bbd3..b96ed81ad8 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 org.springframework.data.jdbc.core.conversion.DbAction.Insert; import org.springframework.data.jdbc.core.conversion.DbAction.Update; -import org.springframework.data.jdbc.mapping.model.JdbcMappingContext; -import org.springframework.data.jdbc.mapping.model.JdbcPersistentEntity; -import org.springframework.data.jdbc.mapping.model.JdbcPersistentEntityInformation; -import org.springframework.data.jdbc.mapping.model.JdbcPersistentProperty; +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.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 afe0ccc32b..f8968ce87e 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.mapping.model.JdbcMappingContext; +import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext; /** * Common infrastructure needed by different implementations of {@link EntityWriter}. diff --git a/src/main/java/org/springframework/data/jdbc/mapping/event/AfterDeleteEvent.java b/src/main/java/org/springframework/data/jdbc/core/mapping/event/AfterDeleteEvent.java similarity index 91% rename from src/main/java/org/springframework/data/jdbc/mapping/event/AfterDeleteEvent.java rename to src/main/java/org/springframework/data/jdbc/core/mapping/event/AfterDeleteEvent.java index d7599c97d8..2ed8b4fc84 100644 --- a/src/main/java/org/springframework/data/jdbc/mapping/event/AfterDeleteEvent.java +++ b/src/main/java/org/springframework/data/jdbc/core/mapping/event/AfterDeleteEvent.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.jdbc.mapping.event; +package org.springframework.data.jdbc.core.mapping.event; import java.util.Optional; import org.springframework.data.jdbc.core.conversion.AggregateChange; -import org.springframework.data.jdbc.mapping.event.Identifier.Specified; +import org.springframework.data.jdbc.core.mapping.event.Identifier.Specified; /** * Gets published after deletion of an entity. It will have a {@link Specified} identifier. If the entity is empty or diff --git a/src/main/java/org/springframework/data/jdbc/mapping/event/AfterLoadEvent.java b/src/main/java/org/springframework/data/jdbc/core/mapping/event/AfterLoadEvent.java similarity index 89% rename from src/main/java/org/springframework/data/jdbc/mapping/event/AfterLoadEvent.java rename to src/main/java/org/springframework/data/jdbc/core/mapping/event/AfterLoadEvent.java index 956bf5bc93..1d30a1ee55 100644 --- a/src/main/java/org/springframework/data/jdbc/mapping/event/AfterLoadEvent.java +++ b/src/main/java/org/springframework/data/jdbc/core/mapping/event/AfterLoadEvent.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.jdbc.mapping.event; +package org.springframework.data.jdbc.core.mapping.event; -import org.springframework.data.jdbc.mapping.event.Identifier.Specified; +import org.springframework.data.jdbc.core.mapping.event.Identifier.Specified; /** * Gets published after instantiation and setting of all the properties of an entity. This allows to do some diff --git a/src/main/java/org/springframework/data/jdbc/mapping/event/AfterSaveEvent.java b/src/main/java/org/springframework/data/jdbc/core/mapping/event/AfterSaveEvent.java similarity index 90% rename from src/main/java/org/springframework/data/jdbc/mapping/event/AfterSaveEvent.java rename to src/main/java/org/springframework/data/jdbc/core/mapping/event/AfterSaveEvent.java index 9a9bb05c40..ffa7cc2e7b 100644 --- a/src/main/java/org/springframework/data/jdbc/mapping/event/AfterSaveEvent.java +++ b/src/main/java/org/springframework/data/jdbc/core/mapping/event/AfterSaveEvent.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.jdbc.mapping.event; +package org.springframework.data.jdbc.core.mapping.event; import org.springframework.data.jdbc.core.conversion.AggregateChange; -import org.springframework.data.jdbc.mapping.event.Identifier.Specified; +import org.springframework.data.jdbc.core.mapping.event.Identifier.Specified; /** * Subclasses of this get published after a new instance or a changed instance was saved in the database. diff --git a/src/main/java/org/springframework/data/jdbc/mapping/event/BeforeDeleteEvent.java b/src/main/java/org/springframework/data/jdbc/core/mapping/event/BeforeDeleteEvent.java similarity index 90% rename from src/main/java/org/springframework/data/jdbc/mapping/event/BeforeDeleteEvent.java rename to src/main/java/org/springframework/data/jdbc/core/mapping/event/BeforeDeleteEvent.java index 9b8b17bb99..f2034a02db 100644 --- a/src/main/java/org/springframework/data/jdbc/mapping/event/BeforeDeleteEvent.java +++ b/src/main/java/org/springframework/data/jdbc/core/mapping/event/BeforeDeleteEvent.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.jdbc.mapping.event; +package org.springframework.data.jdbc.core.mapping.event; import java.util.Optional; import org.springframework.data.jdbc.core.conversion.AggregateChange; -import org.springframework.data.jdbc.mapping.event.Identifier.Specified; +import org.springframework.data.jdbc.core.mapping.event.Identifier.Specified; /** * Gets published when an entity is about to get deleted. diff --git a/src/main/java/org/springframework/data/jdbc/mapping/event/BeforeSaveEvent.java b/src/main/java/org/springframework/data/jdbc/core/mapping/event/BeforeSaveEvent.java similarity index 95% rename from src/main/java/org/springframework/data/jdbc/mapping/event/BeforeSaveEvent.java rename to src/main/java/org/springframework/data/jdbc/core/mapping/event/BeforeSaveEvent.java index 722ce741d1..2b62127fed 100644 --- a/src/main/java/org/springframework/data/jdbc/mapping/event/BeforeSaveEvent.java +++ b/src/main/java/org/springframework/data/jdbc/core/mapping/event/BeforeSaveEvent.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.event; +package org.springframework.data.jdbc.core.mapping.event; import org.springframework.data.jdbc.core.conversion.AggregateChange; diff --git a/src/main/java/org/springframework/data/jdbc/mapping/event/Identifier.java b/src/main/java/org/springframework/data/jdbc/core/mapping/event/Identifier.java similarity index 97% rename from src/main/java/org/springframework/data/jdbc/mapping/event/Identifier.java rename to src/main/java/org/springframework/data/jdbc/core/mapping/event/Identifier.java index d599076db2..7ab52e12b2 100644 --- a/src/main/java/org/springframework/data/jdbc/mapping/event/Identifier.java +++ b/src/main/java/org/springframework/data/jdbc/core/mapping/event/Identifier.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.event; +package org.springframework.data.jdbc.core.mapping.event; import java.util.Optional; diff --git a/src/main/java/org/springframework/data/jdbc/mapping/event/JdbcEvent.java b/src/main/java/org/springframework/data/jdbc/core/mapping/event/JdbcEvent.java similarity index 94% rename from src/main/java/org/springframework/data/jdbc/mapping/event/JdbcEvent.java rename to src/main/java/org/springframework/data/jdbc/core/mapping/event/JdbcEvent.java index 63aaec060c..de66270feb 100644 --- a/src/main/java/org/springframework/data/jdbc/mapping/event/JdbcEvent.java +++ b/src/main/java/org/springframework/data/jdbc/core/mapping/event/JdbcEvent.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.event; +package org.springframework.data.jdbc.core.mapping.event; import java.util.Optional; diff --git a/src/main/java/org/springframework/data/jdbc/mapping/event/JdbcEventWithEntity.java b/src/main/java/org/springframework/data/jdbc/core/mapping/event/JdbcEventWithEntity.java similarity index 95% rename from src/main/java/org/springframework/data/jdbc/mapping/event/JdbcEventWithEntity.java rename to src/main/java/org/springframework/data/jdbc/core/mapping/event/JdbcEventWithEntity.java index 4ff53fec3f..6e7fe136a8 100644 --- a/src/main/java/org/springframework/data/jdbc/mapping/event/JdbcEventWithEntity.java +++ b/src/main/java/org/springframework/data/jdbc/core/mapping/event/JdbcEventWithEntity.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.event; +package org.springframework.data.jdbc.core.mapping.event; import java.util.Optional; diff --git a/src/main/java/org/springframework/data/jdbc/mapping/event/JdbcEventWithId.java b/src/main/java/org/springframework/data/jdbc/core/mapping/event/JdbcEventWithId.java similarity index 85% rename from src/main/java/org/springframework/data/jdbc/mapping/event/JdbcEventWithId.java rename to src/main/java/org/springframework/data/jdbc/core/mapping/event/JdbcEventWithId.java index 4e817e6d2b..00ad2b354d 100644 --- a/src/main/java/org/springframework/data/jdbc/mapping/event/JdbcEventWithId.java +++ b/src/main/java/org/springframework/data/jdbc/core/mapping/event/JdbcEventWithId.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.jdbc.mapping.event; +package org.springframework.data.jdbc.core.mapping.event; import java.util.Optional; import org.springframework.data.jdbc.core.conversion.AggregateChange; -import org.springframework.data.jdbc.mapping.event.Identifier.Specified; +import org.springframework.data.jdbc.core.mapping.event.Identifier.Specified; /** * A {@link SimpleJdbcEvent} guaranteed to have an identifier. @@ -41,7 +41,7 @@ public JdbcEventWithId(Specified id, Optional entity, AggregateChange ch /* * (non-Javadoc) - * @see org.springframework.data.jdbc.mapping.event.JdbcEvent#getId() + * @see org.springframework.data.jdbc.core.mapping.event.JdbcEvent#getId() */ @Override public Specified getId() { diff --git a/src/main/java/org/springframework/data/jdbc/mapping/event/JdbcEventWithIdAndEntity.java b/src/main/java/org/springframework/data/jdbc/core/mapping/event/JdbcEventWithIdAndEntity.java similarity index 89% rename from src/main/java/org/springframework/data/jdbc/mapping/event/JdbcEventWithIdAndEntity.java rename to src/main/java/org/springframework/data/jdbc/core/mapping/event/JdbcEventWithIdAndEntity.java index 99a7227ff4..b40a215e5f 100644 --- a/src/main/java/org/springframework/data/jdbc/mapping/event/JdbcEventWithIdAndEntity.java +++ b/src/main/java/org/springframework/data/jdbc/core/mapping/event/JdbcEventWithIdAndEntity.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.jdbc.mapping.event; +package org.springframework.data.jdbc.core.mapping.event; import lombok.Getter; import java.util.Optional; import org.springframework.data.jdbc.core.conversion.AggregateChange; -import org.springframework.data.jdbc.mapping.event.Identifier.Specified; +import org.springframework.data.jdbc.core.mapping.event.Identifier.Specified; /** * A {@link SimpleJdbcEvent} which is guaranteed to have an identifier and an entity. diff --git a/src/main/java/org/springframework/data/jdbc/mapping/event/SimpleJdbcEvent.java b/src/main/java/org/springframework/data/jdbc/core/mapping/event/SimpleJdbcEvent.java similarity index 88% rename from src/main/java/org/springframework/data/jdbc/mapping/event/SimpleJdbcEvent.java rename to src/main/java/org/springframework/data/jdbc/core/mapping/event/SimpleJdbcEvent.java index 8f7babda5e..f06ac86dbd 100644 --- a/src/main/java/org/springframework/data/jdbc/mapping/event/SimpleJdbcEvent.java +++ b/src/main/java/org/springframework/data/jdbc/core/mapping/event/SimpleJdbcEvent.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.event; +package org.springframework.data.jdbc.core.mapping.event; import java.util.Optional; @@ -45,7 +45,7 @@ class SimpleJdbcEvent extends ApplicationEvent implements JdbcEvent { /* * (non-Javadoc) - * @see org.springframework.data.jdbc.mapping.event.JdbcEvent#getId() + * @see org.springframework.data.jdbc.core.mapping.event.JdbcEvent#getId() */ @Override public Identifier getId() { @@ -54,7 +54,7 @@ public Identifier getId() { /* * (non-Javadoc) - * @see org.springframework.data.jdbc.mapping.event.JdbcEvent#getOptionalEntity() + * @see org.springframework.data.jdbc.core.mapping.event.JdbcEvent#getOptionalEntity() */ @Override public Optional getOptionalEntity() { diff --git a/src/main/java/org/springframework/data/jdbc/mapping/event/SpecifiedIdentifier.java b/src/main/java/org/springframework/data/jdbc/core/mapping/event/SpecifiedIdentifier.java similarity index 82% rename from src/main/java/org/springframework/data/jdbc/mapping/event/SpecifiedIdentifier.java rename to src/main/java/org/springframework/data/jdbc/core/mapping/event/SpecifiedIdentifier.java index 932249a432..f23ad10036 100644 --- a/src/main/java/org/springframework/data/jdbc/mapping/event/SpecifiedIdentifier.java +++ b/src/main/java/org/springframework/data/jdbc/core/mapping/event/SpecifiedIdentifier.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.jdbc.mapping.event; +package org.springframework.data.jdbc.core.mapping.event; import lombok.Value; import java.util.Optional; -import org.springframework.data.jdbc.mapping.event.Identifier.Specified; +import org.springframework.data.jdbc.core.mapping.event.Identifier.Specified; /** * Simple value object for {@link Specified}. @@ -35,7 +35,7 @@ class SpecifiedIdentifier implements Specified { /* * (non-Javadoc) - * @see org.springframework.data.jdbc.mapping.event.Identifier#getOptionalValue() + * @see org.springframework.data.jdbc.core.mapping.event.Identifier#getOptionalValue() */ @Override public Optional getOptionalValue() { diff --git a/src/main/java/org/springframework/data/jdbc/mapping/event/Unset.java b/src/main/java/org/springframework/data/jdbc/core/mapping/event/Unset.java similarity index 86% rename from src/main/java/org/springframework/data/jdbc/mapping/event/Unset.java rename to src/main/java/org/springframework/data/jdbc/core/mapping/event/Unset.java index 0509aff426..436db34fb9 100644 --- a/src/main/java/org/springframework/data/jdbc/mapping/event/Unset.java +++ b/src/main/java/org/springframework/data/jdbc/core/mapping/event/Unset.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.event; +package org.springframework.data.jdbc.core.mapping.event; import java.util.Optional; @@ -30,7 +30,7 @@ enum Unset implements Identifier { /* * (non-Javadoc) - * @see org.springframework.data.jdbc.mapping.event.Identifier#getOptionalValue() + * @see org.springframework.data.jdbc.core.mapping.event.Identifier#getOptionalValue() */ @Override public Optional getOptionalValue() { diff --git a/src/main/java/org/springframework/data/jdbc/mapping/event/WithEntity.java b/src/main/java/org/springframework/data/jdbc/core/mapping/event/WithEntity.java similarity index 94% rename from src/main/java/org/springframework/data/jdbc/mapping/event/WithEntity.java rename to src/main/java/org/springframework/data/jdbc/core/mapping/event/WithEntity.java index fa3f29e4fb..324a265005 100644 --- a/src/main/java/org/springframework/data/jdbc/mapping/event/WithEntity.java +++ b/src/main/java/org/springframework/data/jdbc/core/mapping/event/WithEntity.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.event; +package org.springframework.data.jdbc.core.mapping.event; /** * Interface for {@link SimpleJdbcEvent}s which are guaranteed to have an entity. Allows direct access to that entity, diff --git a/src/main/java/org/springframework/data/jdbc/mapping/event/WithId.java b/src/main/java/org/springframework/data/jdbc/core/mapping/event/WithId.java similarity index 87% rename from src/main/java/org/springframework/data/jdbc/mapping/event/WithId.java rename to src/main/java/org/springframework/data/jdbc/core/mapping/event/WithId.java index e3c06ecd08..be03ed5321 100644 --- a/src/main/java/org/springframework/data/jdbc/mapping/event/WithId.java +++ b/src/main/java/org/springframework/data/jdbc/core/mapping/event/WithId.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.jdbc.mapping.event; +package org.springframework.data.jdbc.core.mapping.event; -import org.springframework.data.jdbc.mapping.event.Identifier.Specified; +import org.springframework.data.jdbc.core.mapping.event.Identifier.Specified; /** * Interface for {@link SimpleJdbcEvent}s which are guaranteed to have a {@link Specified} identifier. Offers direct diff --git a/src/main/java/org/springframework/data/jdbc/mapping/model/BasicJdbcPersistentEntityInformation.java b/src/main/java/org/springframework/data/jdbc/core/mapping/model/BasicJdbcPersistentEntityInformation.java similarity index 90% rename from src/main/java/org/springframework/data/jdbc/mapping/model/BasicJdbcPersistentEntityInformation.java rename to src/main/java/org/springframework/data/jdbc/core/mapping/model/BasicJdbcPersistentEntityInformation.java index b9563f6467..08a575767c 100644 --- a/src/main/java/org/springframework/data/jdbc/mapping/model/BasicJdbcPersistentEntityInformation.java +++ b/src/main/java/org/springframework/data/jdbc/core/mapping/model/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.mapping.model; +package org.springframework.data.jdbc.core.mapping.model; import org.springframework.data.domain.Persistable; import org.springframework.data.repository.core.support.PersistentEntityInformation; @@ -49,7 +49,7 @@ public ID getId(T entity) { /* * (non-Javadoc) - * @see org.springframework.data.jdbc.mapping.model.JdbcPersistentEntityInformation#setId(java.lang.Object, java.util.Optional) + * @see org.springframework.data.jdbc.core.mapping.model.JdbcPersistentEntityInformation#setId(java.lang.Object, java.util.Optional) */ @Override public void setId(T instance, Object value) { diff --git a/src/main/java/org/springframework/data/jdbc/mapping/model/BasicJdbcPersistentProperty.java b/src/main/java/org/springframework/data/jdbc/core/mapping/model/BasicJdbcPersistentProperty.java similarity index 96% rename from src/main/java/org/springframework/data/jdbc/mapping/model/BasicJdbcPersistentProperty.java rename to src/main/java/org/springframework/data/jdbc/core/mapping/model/BasicJdbcPersistentProperty.java index ffc3018d6e..6d1077b248 100644 --- a/src/main/java/org/springframework/data/jdbc/mapping/model/BasicJdbcPersistentProperty.java +++ b/src/main/java/org/springframework/data/jdbc/core/mapping/model/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.mapping.model; +package org.springframework.data.jdbc.core.mapping.model; import org.springframework.data.mapping.Association; import org.springframework.data.mapping.PersistentEntity; @@ -78,7 +78,7 @@ protected Association createAssociation() { /* * (non-Javadoc) - * @see org.springframework.data.jdbc.mapping.model.JdbcPersistentProperty#getColumnName() + * @see org.springframework.data.jdbc.core.mapping.model.JdbcPersistentProperty#getColumnName() */ public String getColumnName() { return context.getNamingStrategy().getColumnName(this); diff --git a/src/main/java/org/springframework/data/jdbc/mapping/model/ConversionCustomizer.java b/src/main/java/org/springframework/data/jdbc/core/mapping/model/ConversionCustomizer.java similarity index 93% rename from src/main/java/org/springframework/data/jdbc/mapping/model/ConversionCustomizer.java rename to src/main/java/org/springframework/data/jdbc/core/mapping/model/ConversionCustomizer.java index 655b50d817..ec94ddb60f 100644 --- a/src/main/java/org/springframework/data/jdbc/mapping/model/ConversionCustomizer.java +++ b/src/main/java/org/springframework/data/jdbc/core/mapping/model/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.mapping.model; +package org.springframework.data.jdbc.core.mapping.model; import org.springframework.core.convert.support.GenericConversionService; diff --git a/src/main/java/org/springframework/data/jdbc/mapping/model/DelimiterNamingStrategy.java b/src/main/java/org/springframework/data/jdbc/core/mapping/model/DelimiterNamingStrategy.java similarity index 97% rename from src/main/java/org/springframework/data/jdbc/mapping/model/DelimiterNamingStrategy.java rename to src/main/java/org/springframework/data/jdbc/core/mapping/model/DelimiterNamingStrategy.java index 1cbb8e620b..1520130a66 100644 --- a/src/main/java/org/springframework/data/jdbc/mapping/model/DelimiterNamingStrategy.java +++ b/src/main/java/org/springframework/data/jdbc/core/mapping/model/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.mapping.model; +package org.springframework.data.jdbc.core.mapping.model; import org.springframework.data.util.ParsingUtils; diff --git a/src/main/java/org/springframework/data/jdbc/mapping/model/JdbcMappingContext.java b/src/main/java/org/springframework/data/jdbc/core/mapping/model/JdbcMappingContext.java similarity index 98% rename from src/main/java/org/springframework/data/jdbc/mapping/model/JdbcMappingContext.java rename to src/main/java/org/springframework/data/jdbc/core/mapping/model/JdbcMappingContext.java index 6318a6747a..651793d5c3 100644 --- a/src/main/java/org/springframework/data/jdbc/mapping/model/JdbcMappingContext.java +++ b/src/main/java/org/springframework/data/jdbc/core/mapping/model/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.mapping.model; +package org.springframework.data.jdbc.core.mapping.model; import static java.util.Arrays.*; diff --git a/src/main/java/org/springframework/data/jdbc/mapping/model/JdbcPersistentEntity.java b/src/main/java/org/springframework/data/jdbc/core/mapping/model/JdbcPersistentEntity.java similarity index 95% rename from src/main/java/org/springframework/data/jdbc/mapping/model/JdbcPersistentEntity.java rename to src/main/java/org/springframework/data/jdbc/core/mapping/model/JdbcPersistentEntity.java index 4530291626..5eb4c64014 100644 --- a/src/main/java/org/springframework/data/jdbc/mapping/model/JdbcPersistentEntity.java +++ b/src/main/java/org/springframework/data/jdbc/core/mapping/model/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.mapping.model; +package org.springframework.data.jdbc.core.mapping.model; import org.springframework.data.mapping.PersistentEntity; import org.springframework.data.mapping.model.MutablePersistentEntity; diff --git a/src/main/java/org/springframework/data/jdbc/mapping/model/JdbcPersistentEntityImpl.java b/src/main/java/org/springframework/data/jdbc/core/mapping/model/JdbcPersistentEntityImpl.java similarity index 92% rename from src/main/java/org/springframework/data/jdbc/mapping/model/JdbcPersistentEntityImpl.java rename to src/main/java/org/springframework/data/jdbc/core/mapping/model/JdbcPersistentEntityImpl.java index b286a565c3..2c59340320 100644 --- a/src/main/java/org/springframework/data/jdbc/mapping/model/JdbcPersistentEntityImpl.java +++ b/src/main/java/org/springframework/data/jdbc/core/mapping/model/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.mapping.model; +package org.springframework.data.jdbc.core.mapping.model; import lombok.Getter; @@ -48,7 +48,7 @@ class JdbcPersistentEntityImpl extends BasicPersistentEntity(template, persistentEntityInformation); } 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 e6ec1e1c61..368bbe15c1 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.data.jdbc.core.DataAccessStrategy; import org.springframework.data.jdbc.core.DefaultDataAccessStrategy; import org.springframework.data.jdbc.core.SqlGeneratorSource; -import org.springframework.data.jdbc.mapping.model.JdbcMappingContext; +import org.springframework.data.jdbc.core.mapping.model.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 088d412fc6..32efe1ae64 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 @@ import org.springframework.beans.BeanUtils; import org.springframework.dao.EmptyResultDataAccessException; -import org.springframework.data.jdbc.mapping.model.JdbcMappingContext; +import org.springframework.data.jdbc.core.mapping.model.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/SimpleJdbcRepository.java b/src/main/java/org/springframework/data/jdbc/repository/support/SimpleJdbcRepository.java similarity index 90% rename from src/main/java/org/springframework/data/jdbc/repository/SimpleJdbcRepository.java rename to src/main/java/org/springframework/data/jdbc/repository/support/SimpleJdbcRepository.java index b6eb7cb0d3..39a0968515 100644 --- a/src/main/java/org/springframework/data/jdbc/repository/SimpleJdbcRepository.java +++ b/src/main/java/org/springframework/data/jdbc/repository/support/SimpleJdbcRepository.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.jdbc.repository; +package org.springframework.data.jdbc.repository.support; import java.util.ArrayList; import java.util.List; import java.util.Optional; -import org.springframework.data.jdbc.core.JdbcEntityOperations; -import org.springframework.data.jdbc.core.JdbcEntityTemplate; -import org.springframework.data.jdbc.mapping.model.JdbcPersistentEntityInformation; +import org.springframework.data.jdbc.core.JdbcAggregateOperations; +import org.springframework.data.jdbc.core.JdbcAggregateTemplate; +import org.springframework.data.jdbc.core.mapping.model.JdbcPersistentEntityInformation; import org.springframework.data.repository.CrudRepository; /** @@ -32,12 +32,12 @@ public class SimpleJdbcRepository implements CrudRepository { private final JdbcPersistentEntityInformation entityInformation; - private final JdbcEntityOperations entityOperations; + private final JdbcAggregateOperations entityOperations; /** * Creates a new {@link SimpleJdbcRepository}. */ - public SimpleJdbcRepository(JdbcEntityTemplate entityOperations, + public SimpleJdbcRepository(JdbcAggregateTemplate entityOperations, JdbcPersistentEntityInformation entityInformation) { this.entityOperations = entityOperations; 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 2313da7ae7..7061bfd6f6 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 org.junit.Test; import org.springframework.data.jdbc.core.FunctionCollector.CombinedDataAccessException; -import org.springframework.data.jdbc.mapping.model.JdbcPersistentProperty; +import org.springframework.data.jdbc.core.mapping.model.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 fc0e0a504e..7ea0a5dc7b 100644 --- a/src/test/java/org/springframework/data/jdbc/core/DefaultDataAccessStrategyUnitTests.java +++ b/src/test/java/org/springframework/data/jdbc/core/DefaultDataAccessStrategyUnitTests.java @@ -25,8 +25,8 @@ import org.junit.Test; import org.mockito.ArgumentCaptor; import org.springframework.data.annotation.Id; -import org.springframework.data.jdbc.mapping.model.JdbcMappingContext; -import org.springframework.data.jdbc.mapping.model.NamingStrategy; +import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext; +import org.springframework.data.jdbc.core.mapping.model.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 bc3329a1c0..7fe7e14954 100644 --- a/src/test/java/org/springframework/data/jdbc/core/DefaultJdbcInterpreterUnitTests.java +++ b/src/test/java/org/springframework/data/jdbc/core/DefaultJdbcInterpreterUnitTests.java @@ -27,9 +27,9 @@ import org.springframework.data.jdbc.core.conversion.DbAction; import org.springframework.data.jdbc.core.conversion.DbAction.Insert; import org.springframework.data.jdbc.core.conversion.JdbcPropertyPath; -import org.springframework.data.jdbc.mapping.model.JdbcMappingContext; -import org.springframework.data.jdbc.mapping.model.JdbcPersistentProperty; -import org.springframework.data.jdbc.mapping.model.NamingStrategy; +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 0e82f70231..ec5ab0398d 100644 --- a/src/test/java/org/springframework/data/jdbc/core/EntityRowMapperUnitTests.java +++ b/src/test/java/org/springframework/data/jdbc/core/EntityRowMapperUnitTests.java @@ -40,10 +40,10 @@ import org.springframework.core.convert.support.GenericConversionService; import org.springframework.data.annotation.Id; import org.springframework.data.convert.Jsr310Converters; -import org.springframework.data.jdbc.mapping.model.JdbcMappingContext; -import org.springframework.data.jdbc.mapping.model.JdbcPersistentEntity; -import org.springframework.data.jdbc.mapping.model.JdbcPersistentProperty; -import org.springframework.data.jdbc.mapping.model.NamingStrategy; +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.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 e2f0bfe6f4..f0e7877f17 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.Configuration; import org.springframework.context.annotation.Import; import org.springframework.data.annotation.Id; -import org.springframework.data.jdbc.mapping.model.JdbcMappingContext; +import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext; import org.springframework.data.jdbc.testing.TestConfiguration; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.rules.SpringClassRule; @@ -39,7 +39,7 @@ import org.springframework.transaction.annotation.Transactional; /** - * Integration tests for {@link JdbcEntityTemplate}. + * Integration tests for {@link JdbcAggregateTemplate}. * * @author Jens Schauder */ @@ -49,7 +49,8 @@ public class JdbcEntityTemplateIntegrationTests { @ClassRule public static final SpringClassRule classRule = new SpringClassRule(); @Rule public SpringMethodRule methodRule = new SpringMethodRule(); - @Autowired JdbcEntityOperations template; + @Autowired + JdbcAggregateOperations template; LegoSet legoSet = createLegoSet(); @@ -250,8 +251,8 @@ Class testClass() { } @Bean - JdbcEntityOperations operations(ApplicationEventPublisher publisher, JdbcMappingContext context, DataAccessStrategy dataAccessStrategy) { - return new JdbcEntityTemplate(publisher, context, dataAccessStrategy); + JdbcAggregateOperations operations(ApplicationEventPublisher publisher, JdbcMappingContext context, DataAccessStrategy dataAccessStrategy) { + return new JdbcAggregateTemplate(publisher, context, dataAccessStrategy); } } } 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 3c9a57c23e..9981774862 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.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; -import org.springframework.data.jdbc.mapping.model.JdbcPersistentProperty; +import org.springframework.data.jdbc.core.mapping.model.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 35ce23c366..e59f90bf4b 100644 --- a/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorContextBasedNamingStrategyUnitTests.java +++ b/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorContextBasedNamingStrategyUnitTests.java @@ -25,9 +25,9 @@ import org.assertj.core.api.SoftAssertions; import org.junit.Test; import org.springframework.data.annotation.Id; -import org.springframework.data.jdbc.mapping.model.JdbcMappingContext; -import org.springframework.data.jdbc.mapping.model.JdbcPersistentEntity; -import org.springframework.data.jdbc.mapping.model.NamingStrategy; +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.mapping.PropertyPath; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations; 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 c9896573b4..9d07c36312 100644 --- a/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorFixedNamingStrategyUnitTests.java +++ b/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorFixedNamingStrategyUnitTests.java @@ -21,10 +21,10 @@ import org.assertj.core.api.SoftAssertions; import org.junit.Test; import org.springframework.data.annotation.Id; -import org.springframework.data.jdbc.mapping.model.JdbcMappingContext; -import org.springframework.data.jdbc.mapping.model.JdbcPersistentEntity; -import org.springframework.data.jdbc.mapping.model.JdbcPersistentProperty; -import org.springframework.data.jdbc.mapping.model.NamingStrategy; +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.mapping.PropertyPath; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations; 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 e597394f49..3fc6b8c479 100644 --- a/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorUnitTests.java +++ b/src/test/java/org/springframework/data/jdbc/core/SqlGeneratorUnitTests.java @@ -25,10 +25,10 @@ import org.junit.Before; import org.junit.Test; import org.springframework.data.annotation.Id; -import org.springframework.data.jdbc.mapping.model.JdbcMappingContext; -import org.springframework.data.jdbc.mapping.model.JdbcPersistentEntity; -import org.springframework.data.jdbc.mapping.model.JdbcPersistentProperty; -import org.springframework.data.jdbc.mapping.model.NamingStrategy; +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.mapping.PropertyPath; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations; 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 d26b40b1b3..3bf8b2d6a6 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 @@ -27,7 +27,7 @@ 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.mapping.model.JdbcMappingContext; +import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations; /** 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 df21805da2..557a36df70 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 @@ -35,7 +35,7 @@ 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.mapping.model.JdbcMappingContext; +import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations; /** diff --git a/src/test/java/org/springframework/data/jdbc/mapping/model/BasicJdbcPersistentEntityInformationUnitTests.java b/src/test/java/org/springframework/data/jdbc/core/mapping/model/BasicJdbcPersistentEntityInformationUnitTests.java similarity index 98% rename from src/test/java/org/springframework/data/jdbc/mapping/model/BasicJdbcPersistentEntityInformationUnitTests.java rename to src/test/java/org/springframework/data/jdbc/core/mapping/model/BasicJdbcPersistentEntityInformationUnitTests.java index 91acc63eaf..2dbb692cea 100644 --- a/src/test/java/org/springframework/data/jdbc/mapping/model/BasicJdbcPersistentEntityInformationUnitTests.java +++ b/src/test/java/org/springframework/data/jdbc/core/mapping/model/BasicJdbcPersistentEntityInformationUnitTests.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.model; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; diff --git a/src/test/java/org/springframework/data/jdbc/mapping/model/BasicJdbcPersistentPropertyUnitTests.java b/src/test/java/org/springframework/data/jdbc/core/mapping/model/BasicJdbcPersistentPropertyUnitTests.java similarity index 97% rename from src/test/java/org/springframework/data/jdbc/mapping/model/BasicJdbcPersistentPropertyUnitTests.java rename to src/test/java/org/springframework/data/jdbc/core/mapping/model/BasicJdbcPersistentPropertyUnitTests.java index 424ca3225c..94f28e6a07 100644 --- a/src/test/java/org/springframework/data/jdbc/mapping/model/BasicJdbcPersistentPropertyUnitTests.java +++ b/src/test/java/org/springframework/data/jdbc/core/mapping/model/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.mapping.model; +package org.springframework.data.jdbc.core.mapping.model; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; diff --git a/src/test/java/org/springframework/data/jdbc/mapping/model/DelimiterNamingStrategyUnitTests.java b/src/test/java/org/springframework/data/jdbc/core/mapping/model/DelimiterNamingStrategyUnitTests.java similarity index 98% rename from src/test/java/org/springframework/data/jdbc/mapping/model/DelimiterNamingStrategyUnitTests.java rename to src/test/java/org/springframework/data/jdbc/core/mapping/model/DelimiterNamingStrategyUnitTests.java index 5ab1d22d5a..3c28a4ec2c 100644 --- a/src/test/java/org/springframework/data/jdbc/mapping/model/DelimiterNamingStrategyUnitTests.java +++ b/src/test/java/org/springframework/data/jdbc/core/mapping/model/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.mapping.model; +package org.springframework.data.jdbc.core.mapping.model; import lombok.Data; import org.junit.Test; diff --git a/src/test/java/org/springframework/data/jdbc/mapping/model/JdbcMappingContextUnitTests.java b/src/test/java/org/springframework/data/jdbc/core/mapping/model/JdbcMappingContextUnitTests.java similarity index 97% rename from src/test/java/org/springframework/data/jdbc/mapping/model/JdbcMappingContextUnitTests.java rename to src/test/java/org/springframework/data/jdbc/core/mapping/model/JdbcMappingContextUnitTests.java index 5c5c034a99..62caa38df1 100644 --- a/src/test/java/org/springframework/data/jdbc/mapping/model/JdbcMappingContextUnitTests.java +++ b/src/test/java/org/springframework/data/jdbc/core/mapping/model/JdbcMappingContextUnitTests.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.model; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; 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 37ac51df51..ec384be7ef 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.context.annotation.Bean; import org.springframework.context.annotation.Import; import org.springframework.data.jdbc.core.DataAccessStrategy; -import org.springframework.data.jdbc.mapping.model.JdbcMappingContext; +import org.springframework.data.jdbc.core.mapping.model.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 c273ab055c..f3999e83c8 100644 --- a/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryIdGenerationIntegrationTests.java +++ b/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryIdGenerationIntegrationTests.java @@ -31,9 +31,10 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.data.annotation.Id; -import org.springframework.data.jdbc.mapping.model.NamingStrategy; +import org.springframework.data.jdbc.core.mapping.model.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; import org.springframework.data.repository.CrudRepository; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; import org.springframework.test.context.ContextConfiguration; diff --git a/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryManipulateDbActionsIntegrationTests.java b/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryManipulateDbActionsIntegrationTests.java index 2ca4c0a02b..87c9795cef 100644 --- a/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryManipulateDbActionsIntegrationTests.java +++ b/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryManipulateDbActionsIntegrationTests.java @@ -38,8 +38,8 @@ import org.springframework.data.annotation.Id; import org.springframework.data.annotation.PersistenceConstructor; import org.springframework.data.jdbc.core.conversion.DbAction; -import org.springframework.data.jdbc.mapping.event.BeforeDeleteEvent; -import org.springframework.data.jdbc.mapping.event.BeforeSaveEvent; +import org.springframework.data.jdbc.core.mapping.event.BeforeDeleteEvent; +import org.springframework.data.jdbc.core.mapping.event.BeforeSaveEvent; 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/JdbcRepositoryPropertyConversionIntegrationTests.java b/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryPropertyConversionIntegrationTests.java index 6ecf3cc229..657ec376dc 100644 --- a/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryPropertyConversionIntegrationTests.java +++ b/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryPropertyConversionIntegrationTests.java @@ -40,7 +40,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.data.annotation.Id; -import org.springframework.data.jdbc.mapping.event.BeforeSaveEvent; +import org.springframework.data.jdbc.core.mapping.event.BeforeSaveEvent; import org.springframework.data.jdbc.repository.support.JdbcRepositoryFactory; import org.springframework.data.jdbc.testing.TestConfiguration; import org.springframework.data.repository.CrudRepository; 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 b901799d29..e446289d0f 100644 --- a/src/test/java/org/springframework/data/jdbc/repository/SimpleJdbcRepositoryEventsUnitTests.java +++ b/src/test/java/org/springframework/data/jdbc/repository/SimpleJdbcRepositoryEventsUnitTests.java @@ -23,15 +23,16 @@ 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.mapping.event.AfterDeleteEvent; -import org.springframework.data.jdbc.mapping.event.AfterLoadEvent; -import org.springframework.data.jdbc.mapping.event.AfterSaveEvent; -import org.springframework.data.jdbc.mapping.event.BeforeDeleteEvent; -import org.springframework.data.jdbc.mapping.event.BeforeSaveEvent; -import org.springframework.data.jdbc.mapping.event.Identifier; -import org.springframework.data.jdbc.mapping.event.JdbcEvent; -import org.springframework.data.jdbc.mapping.model.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; +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; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations; import org.springframework.jdbc.core.namedparam.SqlParameterSource; 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 24b8b0b494..6419194c61 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.LastModifiedDate; import org.springframework.data.auditing.DateTimeProvider; import org.springframework.data.domain.AuditorAware; -import org.springframework.data.jdbc.mapping.model.NamingStrategy; +import org.springframework.data.jdbc.core.mapping.model.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 3c66dba6d9..3efb69b13e 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 org.junit.Before; import org.junit.Test; import org.springframework.data.jdbc.core.DataAccessStrategy; -import org.springframework.data.jdbc.mapping.model.JdbcMappingContext; +import org.springframework.data.jdbc.core.mapping.model.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 41f0ff9aa4..2029a85792 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 @@ -27,7 +27,7 @@ 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.mapping.model.JdbcMappingContext; +import org.springframework.data.jdbc.core.mapping.model.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/repository/support/JdbcRepositoryQueryUnitTests.java b/src/test/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryQueryUnitTests.java index 2d93d43240..08cef5cab5 100644 --- a/src/test/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryQueryUnitTests.java +++ b/src/test/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryQueryUnitTests.java @@ -18,7 +18,7 @@ import org.assertj.core.api.Assertions; import org.junit.Before; import org.junit.Test; -import org.springframework.data.jdbc.mapping.model.JdbcMappingContext; +import org.springframework.data.jdbc.core.mapping.model.JdbcMappingContext; import org.springframework.data.repository.query.DefaultParameters; import org.springframework.data.repository.query.Parameters; import org.springframework.jdbc.core.RowMapper; 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 1be321f944..b67fa4efd7 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.data.jdbc.core.DataAccessStrategy; import org.springframework.data.jdbc.core.DefaultDataAccessStrategy; import org.springframework.data.jdbc.core.SqlGeneratorSource; -import org.springframework.data.jdbc.mapping.model.ConversionCustomizer; -import org.springframework.data.jdbc.mapping.model.JdbcMappingContext; -import org.springframework.data.jdbc.mapping.model.NamingStrategy; +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.repository.support.JdbcRepositoryFactory; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;