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.

Author: odrotbohm

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.core.mapping.model.JdbcPersistentProperty;
+import org.springframework.data.jdbc.core.mapping.JdbcPersistentProperty;
 import org.springframework.data.mapping.PropertyPath;
 
 /**

src/main/java/org/springframework/data/jdbc/core/DataAccessStrategy.java

@@ -17,7 +17,7 @@
 
 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;
 
 /**

src/main/java/org/springframework/data/jdbc/core/DefaultDataAccessStrategy.java

@@ -27,11 +27,11 @@
 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;

src/main/java/org/springframework/data/jdbc/core/DefaultJdbcInterpreter.java

@@ -23,9 +23,9 @@
 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;
 

src/main/java/org/springframework/data/jdbc/core/DelegatingDataAccessStrategy.java

@@ -17,7 +17,7 @@
 
 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;
 

src/main/java/org/springframework/data/jdbc/core/EntityRowMapper.java

@@ -26,9 +26,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.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;

src/main/java/org/springframework/data/jdbc/core/JdbcAggregateTemplate.java

@@ -23,15 +23,15 @@
 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;
 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.

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;

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.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

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

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.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;

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}<Object, AggregateChange>.

src/main/java/org/springframework/data/jdbc/core/mapping/model/BasicJdbcPersistentEntityInformation.java renamed to 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;

src/main/java/org/springframework/data/jdbc/core/mapping/model/BasicJdbcPersistentProperty.java renamed to 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 @@
  * @author Greg Turnquist
  * @since 1.0
  */
-public class BasicJdbcPersistentProperty extends AnnotationBasedPersistentProperty<JdbcPersistentProperty>
+class BasicJdbcPersistentProperty extends AnnotationBasedPersistentProperty<JdbcPersistentProperty>
 		implements JdbcPersistentProperty {
 
 	private static final Map<Class<?>, Class<?>> javaToDbType = new LinkedHashMap<>();

src/main/java/org/springframework/data/jdbc/mapping/model/Column.java renamed to 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;

src/main/java/org/springframework/data/jdbc/core/mapping/model/ConversionCustomizer.java renamed to 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;
 

src/main/java/org/springframework/data/jdbc/core/mapping/model/DelimiterNamingStrategy.java renamed to 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;
 

src/main/java/org/springframework/data/jdbc/core/mapping/model/JdbcMappingContext.java renamed to 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.*;
 

src/main/java/org/springframework/data/jdbc/core/mapping/model/JdbcPersistentEntity.java renamed to 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;
 

src/main/java/org/springframework/data/jdbc/core/mapping/model/JdbcPersistentEntityImpl.java renamed to 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;
 

src/main/java/org/springframework/data/jdbc/core/mapping/model/JdbcPersistentEntityInformation.java renamed to 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;
 

src/main/java/org/springframework/data/jdbc/core/mapping/model/JdbcPersistentProperty.java renamed to 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;
 

src/main/java/org/springframework/data/jdbc/core/mapping/model/NamingStrategy.java renamed to 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}

src/main/java/org/springframework/data/jdbc/mapping/model/Table.java renamed to 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;

src/main/java/org/springframework/data/jdbc/domain/support/JdbcAuditingEventListener.java

@@ -19,9 +19,9 @@
 
 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;
 
 /**

src/main/java/org/springframework/data/jdbc/mybatis/MyBatisDataAccessStrategy.java

@@ -27,8 +27,8 @@
 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;

src/main/java/org/springframework/data/jdbc/repository/config/JdbcConfiguration.java

@@ -19,9 +19,9 @@
 
 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;
 

src/main/java/org/springframework/data/jdbc/repository/support/JdbcQueryLookupStrategy.java

@@ -20,7 +20,7 @@
 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;

src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactory.java

@@ -20,8 +20,8 @@
 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;

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.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;

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.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;

src/main/java/org/springframework/data/jdbc/repository/support/SimpleJdbcRepository.java

@@ -23,7 +23,7 @@
 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 @@
 @RequiredArgsConstructor
 public class SimpleJdbcRepository<T, ID> implements CrudRepository<T, ID> {
 
-	private final JdbcPersistentEntityInformation<T, ID> entityInformation;
-
-	private final JdbcAggregateOperations entityOperations;
-
-	/**
-	 * Creates a new {@link SimpleJdbcRepository}.
-	 */
-	public SimpleJdbcRepository(JdbcAggregateTemplate entityOperations,
-			JdbcPersistentEntityInformation<T, ID> entityInformation) {
-
-		this.entityOperations = entityOperations;
-		this.entityInformation = entityInformation;
-	}
+	private final @NonNull JdbcAggregateOperations entityOperations;
+	private final @NonNull JdbcPersistentEntityInformation<T, ID> entityInformation;
 
 	/*
 	 * (non-Javadoc)

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.core.mapping.model.JdbcPersistentProperty;
+import org.springframework.data.jdbc.core.mapping.JdbcPersistentProperty;
 
 /**
  * Unit tests for {@link CascadingDataAccessStrategy}.

src/test/java/org/springframework/data/jdbc/core/DefaultDataAccessStrategyUnitTests.java

@@ -26,8 +26,8 @@
 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;

src/test/java/org/springframework/data/jdbc/core/DefaultJdbcInterpreterUnitTests.java

@@ -27,10 +27,10 @@
 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;
 
 /**