From 8313a1ac6de0d2707d9bfd551cec4b7a2efb4498 Mon Sep 17 00:00:00 2001 From: Oliver Drotbohm Date: Thu, 8 Aug 2019 09:36:14 +0200 Subject: [PATCH] #514 - Switch to Spring Data JDBC provided config class for MyBatis. --- .../jdbc/mybatis/MyBatisConfiguration.java | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) 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 5a6f93c7..d04a1c1b 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,11 +19,11 @@ import org.apache.ibatis.session.SqlSession; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; -import org.springframework.data.jdbc.core.DataAccessStrategy; +import org.springframework.data.jdbc.core.convert.DataAccessStrategy; import org.springframework.data.jdbc.core.convert.JdbcConverter; import org.springframework.data.jdbc.mybatis.MyBatisDataAccessStrategy; import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories; -import org.springframework.data.jdbc.repository.config.JdbcConfiguration; +import org.springframework.data.jdbc.repository.config.MyBatisJdbcConfiguration; import org.springframework.data.relational.core.mapping.RelationalMappingContext; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations; @@ -33,12 +33,5 @@ import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations; */ @Configuration @EnableJdbcRepositories -@Import(JdbcConfiguration.class) -public class MyBatisConfiguration { - - @Bean - DataAccessStrategy defaultDataAccessStrategy(RelationalMappingContext context, JdbcConverter converter, - NamedParameterJdbcOperations operations, SqlSession sqlSession) { - return MyBatisDataAccessStrategy.createCombinedAccessStrategy(context, converter, operations, sqlSession); - } -} +@Import(MyBatisJdbcConfiguration.class) +public class MyBatisConfiguration {}