DATAJDBC-226 - Extracted packages not directly tied to JDBC into separate package.

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

@@ -21,8 +21,8 @@ import java.util.Map;
 import java.util.function.Consumer;
 import java.util.function.Function;
 
-import org.springframework.data.jdbc.core.mapping.JdbcPersistentProperty;
 import org.springframework.data.mapping.PropertyPath;
+import org.springframework.data.relational.core.mapping.JdbcPersistentProperty;
 
 /**
  * Delegates each methods to the {@link DataAccessStrategy}s passed to the constructor in turn until the first that does
@@ -100,7 +100,9 @@ public class CascadingDataAccessStrategy implements DataAccessStrategy {
 	}
 
 	private <T> T collect(Function<DataAccessStrategy, T> function) {
-		return strategies.stream().collect(new FunctionCollector<>(function));
+
+		// Keep <T> as Eclipse fails to compile if <> is used.
+		return strategies.stream().collect(new FunctionCollector<T>(function));
 	}
 
 	private void collectVoid(Consumer<DataAccessStrategy> consumer) {

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

@@ -17,8 +17,8 @@ package org.springframework.data.jdbc.core;
 
 import java.util.Map;
 
-import org.springframework.data.jdbc.core.mapping.JdbcPersistentProperty;
 import org.springframework.data.mapping.PropertyPath;
+import org.springframework.data.relational.core.mapping.JdbcPersistentProperty;
 import org.springframework.lang.Nullable;
 
 /**

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

@@ -28,14 +28,14 @@ import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.dao.NonTransientDataAccessException;
 import org.springframework.data.convert.EntityInstantiators;
-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.support.JdbcUtil;
 import org.springframework.data.mapping.PersistentPropertyAccessor;
 import org.springframework.data.mapping.PropertyHandler;
 import org.springframework.data.mapping.PropertyPath;
 import org.springframework.data.mapping.model.ConvertingPropertyAccessor;
+import org.springframework.data.relational.core.mapping.JdbcMappingContext;
+import org.springframework.data.relational.core.mapping.JdbcPersistentEntity;
+import org.springframework.data.relational.core.mapping.JdbcPersistentProperty;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations;

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

@@ -18,15 +18,15 @@ package org.springframework.data.jdbc.core;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.springframework.data.jdbc.core.conversion.DbAction;
-import org.springframework.data.jdbc.core.conversion.DbAction.Delete;
-import org.springframework.data.jdbc.core.conversion.DbAction.DeleteAll;
-import org.springframework.data.jdbc.core.conversion.DbAction.Insert;
-import org.springframework.data.jdbc.core.conversion.DbAction.Update;
-import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
-import org.springframework.data.jdbc.core.mapping.JdbcPersistentEntity;
-import org.springframework.data.jdbc.core.conversion.Interpreter;
 import org.springframework.data.mapping.PropertyPath;
+import org.springframework.data.relational.core.conversion.DbAction;
+import org.springframework.data.relational.core.conversion.Interpreter;
+import org.springframework.data.relational.core.conversion.DbAction.Delete;
+import org.springframework.data.relational.core.conversion.DbAction.DeleteAll;
+import org.springframework.data.relational.core.conversion.DbAction.Insert;
+import org.springframework.data.relational.core.conversion.DbAction.Update;
+import org.springframework.data.relational.core.mapping.JdbcMappingContext;
+import org.springframework.data.relational.core.mapping.JdbcPersistentEntity;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 

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

@@ -17,8 +17,8 @@ package org.springframework.data.jdbc.core;
 
 import java.util.Map;
 
-import org.springframework.data.jdbc.core.mapping.JdbcPersistentProperty;
 import org.springframework.data.mapping.PropertyPath;
+import org.springframework.data.relational.core.mapping.JdbcPersistentProperty;
 import org.springframework.util.Assert;
 
 /**

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

@@ -25,15 +25,15 @@ import java.util.Map;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.data.convert.EntityInstantiators;
-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;
 import org.springframework.data.mapping.PreferredConstructor.Parameter;
 import org.springframework.data.mapping.model.ConvertingPropertyAccessor;
 import org.springframework.data.mapping.model.ParameterValueProvider;
+import org.springframework.data.relational.core.mapping.JdbcMappingContext;
+import org.springframework.data.relational.core.mapping.JdbcPersistentEntity;
+import org.springframework.data.relational.core.mapping.JdbcPersistentProperty;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;

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

@@ -18,21 +18,21 @@ package org.springframework.data.jdbc.core;
 import java.util.Optional;
 
 import org.springframework.context.ApplicationEventPublisher;
-import org.springframework.data.jdbc.core.conversion.AggregateChange;
-import org.springframework.data.jdbc.core.conversion.AggregateChange.Kind;
-import org.springframework.data.jdbc.core.conversion.Interpreter;
-import org.springframework.data.jdbc.core.conversion.JdbcEntityDeleteWriter;
-import org.springframework.data.jdbc.core.conversion.JdbcEntityWriter;
-import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
-import org.springframework.data.jdbc.core.mapping.JdbcPersistentEntity;
-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.mapping.IdentifierAccessor;
+import org.springframework.data.relational.core.conversion.AggregateChange;
+import org.springframework.data.relational.core.conversion.Interpreter;
+import org.springframework.data.relational.core.conversion.JdbcEntityDeleteWriter;
+import org.springframework.data.relational.core.conversion.JdbcEntityWriter;
+import org.springframework.data.relational.core.conversion.AggregateChange.Kind;
+import org.springframework.data.relational.core.mapping.JdbcMappingContext;
+import org.springframework.data.relational.core.mapping.JdbcPersistentEntity;
+import org.springframework.data.relational.core.mapping.event.AfterDeleteEvent;
+import org.springframework.data.relational.core.mapping.event.AfterLoadEvent;
+import org.springframework.data.relational.core.mapping.event.AfterSaveEvent;
+import org.springframework.data.relational.core.mapping.event.BeforeDeleteEvent;
+import org.springframework.data.relational.core.mapping.event.BeforeSaveEvent;
+import org.springframework.data.relational.core.mapping.event.Identifier;
+import org.springframework.data.relational.core.mapping.event.Identifier.Specified;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 

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

@@ -24,12 +24,12 @@ import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-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;
+import org.springframework.data.relational.core.mapping.JdbcMappingContext;
+import org.springframework.data.relational.core.mapping.JdbcPersistentEntity;
+import org.springframework.data.relational.core.mapping.JdbcPersistentProperty;
 import org.springframework.data.util.Lazy;
 import org.springframework.data.util.StreamUtils;
 import org.springframework.lang.Nullable;

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

@@ -20,7 +20,7 @@ import lombok.RequiredArgsConstructor;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
+import org.springframework.data.relational.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/mybatis/MyBatisDataAccessStrategy.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.DelegatingDataAccessStrategy;
 import org.springframework.data.jdbc.core.SqlGeneratorSource;
-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.data.relational.core.mapping.JdbcMappingContext;
+import org.springframework.data.relational.core.mapping.JdbcPersistentProperty;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations;
 import org.springframework.util.Assert;
 

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

@@ -24,7 +24,7 @@ import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
 import org.springframework.data.auditing.IsNewAwareAuditingHandler;
 import org.springframework.data.auditing.config.AuditingBeanDefinitionRegistrarSupport;
 import org.springframework.data.auditing.config.AuditingConfiguration;
-import org.springframework.data.jdbc.domain.support.JdbcAuditingEventListener;
+import org.springframework.data.relational.domain.support.JdbcAuditingEventListener;
 import org.springframework.util.Assert;
 
 /**

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

@@ -19,9 +19,9 @@ import java.util.Optional;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.jdbc.core.mapping.ConversionCustomizer;
-import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
-import org.springframework.data.jdbc.core.mapping.NamingStrategy;
+import org.springframework.data.relational.core.mapping.ConversionCustomizer;
+import org.springframework.data.relational.core.mapping.JdbcMappingContext;
+import org.springframework.data.relational.core.mapping.NamingStrategy;
 
 /**
  * Beans that must be registered for Spring Data JDBC to work.

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

@@ -21,9 +21,9 @@ import org.springframework.core.convert.ConversionService;
 import org.springframework.data.convert.EntityInstantiators;
 import org.springframework.data.jdbc.core.DataAccessStrategy;
 import org.springframework.data.jdbc.core.EntityRowMapper;
-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.relational.core.mapping.JdbcMappingContext;
 import org.springframework.data.repository.core.NamedQueries;
 import org.springframework.data.repository.core.RepositoryMetadata;
 import org.springframework.data.repository.query.QueryLookupStrategy;

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

@@ -21,9 +21,9 @@ import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.data.convert.EntityInstantiators;
 import org.springframework.data.jdbc.core.DataAccessStrategy;
 import org.springframework.data.jdbc.core.JdbcAggregateTemplate;
-import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
-import org.springframework.data.jdbc.core.mapping.JdbcPersistentEntity;
 import org.springframework.data.jdbc.repository.RowMapperMap;
+import org.springframework.data.relational.core.mapping.JdbcMappingContext;
+import org.springframework.data.relational.core.mapping.JdbcPersistentEntity;
 import org.springframework.data.repository.core.EntityInformation;
 import org.springframework.data.repository.core.RepositoryInformation;
 import org.springframework.data.repository.core.RepositoryMetadata;

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

@@ -24,8 +24,8 @@ import org.springframework.data.convert.EntityInstantiators;
 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.JdbcMappingContext;
 import org.springframework.data.jdbc.repository.RowMapperMap;
+import org.springframework.data.relational.core.mapping.JdbcMappingContext;
 import org.springframework.data.repository.Repository;
 import org.springframework.data.repository.core.support.RepositoryFactorySupport;
 import org.springframework.data.repository.core.support.TransactionalRepositoryFactoryBeanSupport;

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

@@ -17,7 +17,7 @@ package org.springframework.data.jdbc.repository.support;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.dao.EmptyResultDataAccessException;
-import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
+import org.springframework.data.relational.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/relational/core/conversion/AggregateChange.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.conversion;
+package org.springframework.data.relational.core.conversion;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;

src/main/java/org/springframework/data/relational/core/conversion/DbAction.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.conversion;
+package org.springframework.data.relational.core.conversion;
 
 import lombok.Getter;
 import lombok.ToString;

src/main/java/org/springframework/data/relational/core/conversion/DbActionExecutionException.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.conversion;
+package org.springframework.data.relational.core.conversion;
 
 /**
  * Exception thrown when during the execution of a {@link DbAction} an exception gets thrown. Provides additional

src/main/java/org/springframework/data/relational/core/conversion/Interpreter.java

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.conversion;
+package org.springframework.data.relational.core.conversion;
 
-import org.springframework.data.jdbc.core.conversion.DbAction.Delete;
-import org.springframework.data.jdbc.core.conversion.DbAction.DeleteAll;
-import org.springframework.data.jdbc.core.conversion.DbAction.Insert;
-import org.springframework.data.jdbc.core.conversion.DbAction.Update;
+import org.springframework.data.relational.core.conversion.DbAction.Delete;
+import org.springframework.data.relational.core.conversion.DbAction.DeleteAll;
+import org.springframework.data.relational.core.conversion.DbAction.Insert;
+import org.springframework.data.relational.core.conversion.DbAction.Update;
 
 /**
  * An {@link Interpreter} gets called by a {@link AggregateChange} for each {@link DbAction} and is tasked with

src/main/java/org/springframework/data/relational/core/conversion/JdbcEntityDeleteWriter.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.conversion;
+package org.springframework.data.relational.core.conversion;
 
-import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
+import org.springframework.data.relational.core.mapping.JdbcMappingContext;
 import org.springframework.lang.Nullable;
 
 /**

src/main/java/org/springframework/data/relational/core/conversion/JdbcEntityWriter.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.conversion;
+package org.springframework.data.relational.core.conversion;
 
 import lombok.Data;
 
@@ -23,15 +23,15 @@ import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Stream;
 
-import org.springframework.data.jdbc.core.conversion.DbAction.Insert;
-import org.springframework.data.jdbc.core.conversion.DbAction.Update;
-import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
-import org.springframework.data.jdbc.core.mapping.JdbcPersistentEntity;
-import org.springframework.data.jdbc.core.mapping.JdbcPersistentProperty;
 import org.springframework.data.mapping.IdentifierAccessor;
 import org.springframework.data.mapping.PersistentEntity;
 import org.springframework.data.mapping.PersistentProperty;
 import org.springframework.data.mapping.PersistentPropertyAccessor;
+import org.springframework.data.relational.core.conversion.DbAction.Insert;
+import org.springframework.data.relational.core.conversion.DbAction.Update;
+import org.springframework.data.relational.core.mapping.JdbcMappingContext;
+import org.springframework.data.relational.core.mapping.JdbcPersistentEntity;
+import org.springframework.data.relational.core.mapping.JdbcPersistentProperty;
 import org.springframework.data.util.StreamUtils;
 
 /**

src/main/java/org/springframework/data/relational/core/conversion/JdbcEntityWriterSupport.java

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.conversion;
+package org.springframework.data.relational.core.conversion;
 
 import org.springframework.data.convert.EntityWriter;
-import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
+import org.springframework.data.relational.core.mapping.JdbcMappingContext;
 import org.springframework.util.Assert;
 
 /**
@@ -36,7 +36,7 @@ abstract class JdbcEntityWriterSupport implements EntityWriter<Object, Aggregate
 	}
 
 	/**
-	 * add {@link org.springframework.data.jdbc.core.conversion.DbAction.Delete} actions to the {@link AggregateChange}
+	 * add {@link org.springframework.data.relational.core.conversion.DbAction.Delete} actions to the {@link AggregateChange}
 	 * for deleting all referenced entities.
 	 *
 	 * @param id id of the aggregate root, of which the referenced entities get deleted.

src/main/java/org/springframework/data/relational/core/conversion/JdbcPropertyPath.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.conversion;
+package org.springframework.data.relational.core.conversion;
 
 import org.springframework.data.mapping.PropertyPath;
 import org.springframework.util.Assert;

src/main/java/org/springframework/data/relational/core/conversion/package-info.java

@@ -2,6 +2,6 @@
  * @author Jens Schauder
  */
 @NonNullApi
-package org.springframework.data.jdbc.core.mapping;
+package org.springframework.data.relational.core.conversion;
 
 import org.springframework.lang.NonNullApi;

src/main/java/org/springframework/data/relational/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;
+package org.springframework.data.relational.core.mapping;
 
 import java.time.ZonedDateTime;
 import java.time.temporal.Temporal;

src/main/java/org/springframework/data/relational/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.core.mapping;
+package org.springframework.data.relational.core.mapping;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

src/main/java/org/springframework/data/relational/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;
+package org.springframework.data.relational.core.mapping;
 
 import org.springframework.core.convert.support.GenericConversionService;
 

src/main/java/org/springframework/data/relational/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;
+package org.springframework.data.relational.core.mapping;
 
 import static java.util.Arrays.*;
 

src/main/java/org/springframework/data/relational/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;
+package org.springframework.data.relational.core.mapping;
 
 import org.springframework.data.mapping.model.MutablePersistentEntity;
 

src/main/java/org/springframework/data/relational/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;
+package org.springframework.data.relational.core.mapping;
 
 import java.util.Optional;
 

src/main/java/org/springframework/data/relational/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;
+package org.springframework.data.relational.core.mapping;
 
 import org.springframework.data.mapping.PersistentProperty;
 import org.springframework.lang.Nullable;

src/main/java/org/springframework/data/relational/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;
+package org.springframework.data.relational.core.mapping;
 
 import org.springframework.data.util.ParsingUtils;
 import org.springframework.util.Assert;

src/main/java/org/springframework/data/relational/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.core.mapping;
+package org.springframework.data.relational.core.mapping;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

src/main/java/org/springframework/data/relational/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.core.mapping.event;
+package org.springframework.data.relational.core.mapping.event;
 
 import java.util.Optional;
 
-import org.springframework.data.jdbc.core.conversion.AggregateChange;
-import org.springframework.data.jdbc.core.mapping.event.Identifier.Specified;
+import org.springframework.data.relational.core.conversion.AggregateChange;
+import org.springframework.data.relational.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

src/main/java/org/springframework/data/relational/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.core.mapping.event;
+package org.springframework.data.relational.core.mapping.event;
 
-import org.springframework.data.jdbc.core.mapping.event.Identifier.Specified;
+import org.springframework.data.relational.core.mapping.event.Identifier.Specified;
 
 /**
  * Gets published after instantiation and setting of all the properties of an entity. This allows to do some

src/main/java/org/springframework/data/relational/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.core.mapping.event;
+package org.springframework.data.relational.core.mapping.event;
 
-import org.springframework.data.jdbc.core.conversion.AggregateChange;
-import org.springframework.data.jdbc.core.mapping.event.Identifier.Specified;
+import org.springframework.data.relational.core.conversion.AggregateChange;
+import org.springframework.data.relational.core.mapping.event.Identifier.Specified;
 
 /**
  * Gets published after a new instance or a changed instance was saved in the database.

src/main/java/org/springframework/data/relational/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.core.mapping.event;
+package org.springframework.data.relational.core.mapping.event;
 
 import java.util.Optional;
 
-import org.springframework.data.jdbc.core.conversion.AggregateChange;
-import org.springframework.data.jdbc.core.mapping.event.Identifier.Specified;
+import org.springframework.data.relational.core.conversion.AggregateChange;
+import org.springframework.data.relational.core.mapping.event.Identifier.Specified;
 
 /**
  * Gets published when an entity is about to get deleted. The contained {@link AggregateChange} is mutable and may be

src/main/java/org/springframework/data/relational/core/mapping/event/BeforeSaveEvent.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.mapping.event;
+package org.springframework.data.relational.core.mapping.event;
 
-import org.springframework.data.jdbc.core.conversion.AggregateChange;
+import org.springframework.data.relational.core.conversion.AggregateChange;
 
 /**
  * Gets published before an entity gets saved to the database. The contained {@link AggregateChange} is mutable and may

src/main/java/org/springframework/data/relational/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.core.mapping.event;
+package org.springframework.data.relational.core.mapping.event;
 
 import java.util.Optional;
 

src/main/java/org/springframework/data/relational/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.core.mapping.event;
+package org.springframework.data.relational.core.mapping.event;
 
 import java.util.Optional;
 

src/main/java/org/springframework/data/relational/core/mapping/event/JdbcEventWithEntity.java

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.mapping.event;
+package org.springframework.data.relational.core.mapping.event;
 
 import java.util.Optional;
 
-import org.springframework.data.jdbc.core.conversion.AggregateChange;
+import org.springframework.data.relational.core.conversion.AggregateChange;
 
 /**
  * A {@link SimpleJdbcEvent} which is guaranteed to have an entity.

src/main/java/org/springframework/data/relational/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.core.mapping.event;
+package org.springframework.data.relational.core.mapping.event;
 
 import java.util.Optional;
 
-import org.springframework.data.jdbc.core.conversion.AggregateChange;
-import org.springframework.data.jdbc.core.mapping.event.Identifier.Specified;
+import org.springframework.data.relational.core.conversion.AggregateChange;
+import org.springframework.data.relational.core.mapping.event.Identifier.Specified;
 import org.springframework.lang.Nullable;
 
 /**

src/main/java/org/springframework/data/relational/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.core.mapping.event;
+package org.springframework.data.relational.core.mapping.event;
 
 import lombok.Getter;
 
 import java.util.Optional;
 
-import org.springframework.data.jdbc.core.conversion.AggregateChange;
-import org.springframework.data.jdbc.core.mapping.event.Identifier.Specified;
+import org.springframework.data.relational.core.conversion.AggregateChange;
+import org.springframework.data.relational.core.mapping.event.Identifier.Specified;
 import org.springframework.lang.Nullable;
 
 /**

src/main/java/org/springframework/data/relational/core/mapping/event/SimpleJdbcEvent.java

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.mapping.event;
+package org.springframework.data.relational.core.mapping.event;
 
 import java.util.Optional;
 
 import org.springframework.context.ApplicationEvent;
-import org.springframework.data.jdbc.core.conversion.AggregateChange;
+import org.springframework.data.relational.core.conversion.AggregateChange;
 import org.springframework.lang.Nullable;
 
 /**

src/main/java/org/springframework/data/relational/core/mapping/event/SpecifiedIdentifier.java

@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.mapping.event;
+package org.springframework.data.relational.core.mapping.event;
 
 import lombok.NonNull;
 import lombok.Value;
 
 import java.util.Optional;
 
-import org.springframework.data.jdbc.core.mapping.event.Identifier.Specified;
+import org.springframework.data.relational.core.mapping.event.Identifier.Specified;
 
 /**
  * Simple value object for {@link Specified}.

src/main/java/org/springframework/data/relational/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.core.mapping.event;
+package org.springframework.data.relational.core.mapping.event;
 
 import java.util.Optional;
 

src/main/java/org/springframework/data/relational/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.core.mapping.event;
+package org.springframework.data.relational.core.mapping.event;
 
 /**
  * Interface for {@link SimpleJdbcEvent}s which are guaranteed to have an entity. Allows direct access to that entity,

src/main/java/org/springframework/data/relational/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.core.mapping.event;
+package org.springframework.data.relational.core.mapping.event;
 
-import org.springframework.data.jdbc.core.mapping.event.Identifier.Specified;
+import org.springframework.data.relational.core.mapping.event.Identifier.Specified;
 
 /**
  * Interface for {@link SimpleJdbcEvent}s which are guaranteed to have a {@link Specified} identifier. Offers direct

src/main/java/org/springframework/data/relational/core/mapping/event/package-info.java

@@ -2,6 +2,6 @@
  * @author Jens Schauder
  */
 @NonNullApi
-package org.springframework.data.jdbc.domain.support;
+package org.springframework.data.relational.core.mapping.event;
 
 import org.springframework.lang.NonNullApi;

src/main/java/org/springframework/data/relational/core/mapping/package-info.java

@@ -2,6 +2,6 @@
  * @author Jens Schauder
  */
 @NonNullApi
-package org.springframework.data.jdbc.core.conversion;
+package org.springframework.data.relational.core.mapping;
 
 import org.springframework.lang.NonNullApi;

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

@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.domain.support;
+package org.springframework.data.relational.domain.support;
 
 import lombok.RequiredArgsConstructor;
 
 import org.springframework.context.ApplicationListener;
 import org.springframework.data.auditing.IsNewAwareAuditingHandler;
-import org.springframework.data.jdbc.core.mapping.event.BeforeSaveEvent;
 import org.springframework.data.jdbc.repository.config.EnableJdbcAuditing;
+import org.springframework.data.relational.core.mapping.event.BeforeSaveEvent;
 
 /**
  * Spring JDBC event listener to capture auditing information on persisting and updating entities.

src/main/java/org/springframework/data/relational/domain/support/package-info.java

@@ -2,6 +2,6 @@
  * @author Jens Schauder
  */
 @NonNullApi
-package org.springframework.data.jdbc.core.mapping.event;
+package org.springframework.data.relational.domain.support;
 
 import org.springframework.lang.NonNullApi;