From b0bfdaeaee2311ff03402a8e9d5ac656fa7e3a6f Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Thu, 28 Jun 2018 11:47:32 +0200 Subject: [PATCH] #379 - Reflect package changes in Spring Data JDBC. --- .../basics/aggregate/AggregateConfiguration.java | 14 +++++++------- .../springdata/jdbc/basics/aggregate/Manual.java | 4 ++-- .../basics/simpleentity/CategoryConfiguration.java | 6 +++--- .../jdbc/mybatis/MyBatisConfiguration.java | 5 +++-- .../r2dbc/basics/InfrastructureConfiguration.java | 4 ++-- 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/jdbc/basics/src/main/java/example/springdata/jdbc/basics/aggregate/AggregateConfiguration.java b/jdbc/basics/src/main/java/example/springdata/jdbc/basics/aggregate/AggregateConfiguration.java index f01eb668..230fea84 100644 --- a/jdbc/basics/src/main/java/example/springdata/jdbc/basics/aggregate/AggregateConfiguration.java +++ b/jdbc/basics/src/main/java/example/springdata/jdbc/basics/aggregate/AggregateConfiguration.java @@ -25,11 +25,11 @@ import org.springframework.context.ApplicationListener; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; -import org.springframework.data.jdbc.core.mapping.event.BeforeSaveEvent; -import org.springframework.data.jdbc.core.mapping.ConversionCustomizer; -import org.springframework.data.jdbc.core.mapping.JdbcPersistentProperty; -import org.springframework.data.jdbc.core.mapping.NamingStrategy; import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories; +import org.springframework.data.relational.core.mapping.ConversionCustomizer; +import org.springframework.data.relational.core.mapping.RelationalPersistentProperty; +import org.springframework.data.relational.core.mapping.NamingStrategy; +import org.springframework.data.relational.core.mapping.event.BeforeSaveEvent; import org.springframework.lang.Nullable; /** @@ -81,7 +81,7 @@ public class AggregateConfiguration { return new NamingStrategy() { @Override - public String getColumnName(JdbcPersistentProperty property) { + public String getColumnName(RelationalPersistentProperty property) { String defaultName = NamingStrategy.super.getColumnName(property); String key = getTableName(property.getOwner().getType()) + "." + defaultName; @@ -89,13 +89,13 @@ public class AggregateConfiguration { } @Override - public String getReverseColumnName(JdbcPersistentProperty property) { + public String getReverseColumnName(RelationalPersistentProperty property) { return reverseColumnAliases.computeIfAbsent(property.getName(), __ -> NamingStrategy.super.getReverseColumnName(property)); } @Override - public String getKeyColumn(JdbcPersistentProperty property) { + public String getKeyColumn(RelationalPersistentProperty property) { return keyColumnAliases.computeIfAbsent(property.getName(), __ -> NamingStrategy.super.getKeyColumn(property)); } }; diff --git a/jdbc/basics/src/main/java/example/springdata/jdbc/basics/aggregate/Manual.java b/jdbc/basics/src/main/java/example/springdata/jdbc/basics/aggregate/Manual.java index e594b505..e5faefac 100644 --- a/jdbc/basics/src/main/java/example/springdata/jdbc/basics/aggregate/Manual.java +++ b/jdbc/basics/src/main/java/example/springdata/jdbc/basics/aggregate/Manual.java @@ -18,8 +18,8 @@ package example.springdata.jdbc.basics.aggregate; import lombok.Data; import org.springframework.data.annotation.Id; -import org.springframework.data.jdbc.core.mapping.Column; -import org.springframework.data.jdbc.core.mapping.Table; +import org.springframework.data.relational.core.mapping.Column; +import org.springframework.data.relational.core.mapping.Table; /** * A manual instructing how to assemble a {@link LegoSet}. diff --git a/jdbc/basics/src/main/java/example/springdata/jdbc/basics/simpleentity/CategoryConfiguration.java b/jdbc/basics/src/main/java/example/springdata/jdbc/basics/simpleentity/CategoryConfiguration.java index 2295fc05..e4a37e3d 100644 --- a/jdbc/basics/src/main/java/example/springdata/jdbc/basics/simpleentity/CategoryConfiguration.java +++ b/jdbc/basics/src/main/java/example/springdata/jdbc/basics/simpleentity/CategoryConfiguration.java @@ -19,9 +19,9 @@ import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationListener; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.data.jdbc.core.mapping.event.BeforeSaveEvent; -import org.springframework.data.jdbc.core.mapping.event.JdbcEvent; import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories; +import org.springframework.data.relational.core.mapping.event.BeforeSaveEvent; +import org.springframework.data.relational.core.mapping.event.RelationalEvent; /** * Contains infrastructure necessary for creating repositories and two listeners. @@ -38,7 +38,7 @@ public class CategoryConfiguration { public ApplicationListener loggingListener() { return (ApplicationListener) event -> { - if (event instanceof JdbcEvent) { + if (event instanceof RelationalEvent) { System.out.println("Received an event: " + event); } }; diff --git a/jdbc/mybatis/src/main/java/example/springdata/jdbc/mybatis/MyBatisConfiguration.java b/jdbc/mybatis/src/main/java/example/springdata/jdbc/mybatis/MyBatisConfiguration.java index aa2c7b44..c1f20ae2 100644 --- a/jdbc/mybatis/src/main/java/example/springdata/jdbc/mybatis/MyBatisConfiguration.java +++ b/jdbc/mybatis/src/main/java/example/springdata/jdbc/mybatis/MyBatisConfiguration.java @@ -19,9 +19,9 @@ import org.apache.ibatis.session.SqlSession; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.data.jdbc.core.DataAccessStrategy; -import org.springframework.data.jdbc.core.mapping.JdbcMappingContext; import org.springframework.data.jdbc.mybatis.MyBatisDataAccessStrategy; import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories; +import org.springframework.data.relational.core.mapping.RelationalMappingContext; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations; /** @@ -32,7 +32,8 @@ import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations; public class MyBatisConfiguration { @Bean - DataAccessStrategy defaultDataAccessStrategy(JdbcMappingContext context, NamedParameterJdbcOperations operations, SqlSession sqlSession) { + DataAccessStrategy defaultDataAccessStrategy(RelationalMappingContext context, + NamedParameterJdbcOperations operations, SqlSession sqlSession) { return MyBatisDataAccessStrategy.createCombinedAccessStrategy(context, operations, sqlSession); } } diff --git a/jdbc/r2dbc/src/test/java/example/springdata/r2dbc/basics/InfrastructureConfiguration.java b/jdbc/r2dbc/src/test/java/example/springdata/r2dbc/basics/InfrastructureConfiguration.java index 4c67cada..7c24b7e6 100644 --- a/jdbc/r2dbc/src/test/java/example/springdata/r2dbc/basics/InfrastructureConfiguration.java +++ b/jdbc/r2dbc/src/test/java/example/springdata/r2dbc/basics/InfrastructureConfiguration.java @@ -21,9 +21,9 @@ import io.r2dbc.spi.ConnectionFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.data.jdbc.core.mapping.JdbcMappingContext; import org.springframework.data.r2dbc.function.DatabaseClient; import org.springframework.data.r2dbc.repository.support.R2dbcRepositoryFactory; +import org.springframework.data.relational.core.mapping.RelationalMappingContext; /** * @author Oliver Gierke @@ -39,7 +39,7 @@ class InfrastructureConfiguration { @Bean R2dbcRepositoryFactory repositoryFactory(DatabaseClient client) { - JdbcMappingContext context = new JdbcMappingContext(); + RelationalMappingContext context = new RelationalMappingContext(); context.afterPropertiesSet(); return new R2dbcRepositoryFactory(client, context);