From e2d2bdf6bce90b5e11a49ac8fef2270d250e5f68 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@pivotal.io>
Date: Thu, 26 Jul 2018 10:43:11 +0200
Subject: [PATCH] #380 - Import JdbcConfiguration after EnableJdbcRepositories
 no longer provides the required beans.

---
 .../jdbc/basics/simpleentity/CategoryConfiguration.java       | 4 ++++
 .../example/springdata/jdbc/mybatis/MyBatisConfiguration.java | 4 ++++
 2 files changed, 8 insertions(+)

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 e4a37e3d..d5c561b8 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,7 +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.context.annotation.Import;
 import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
+import org.springframework.data.jdbc.repository.config.JdbcConfiguration;
 import org.springframework.data.relational.core.mapping.event.BeforeSaveEvent;
 import org.springframework.data.relational.core.mapping.event.RelationalEvent;
 
@@ -29,9 +31,11 @@ import org.springframework.data.relational.core.mapping.event.RelationalEvent;
  * Not that a listener may change an entity without any problem.
  *
  * @author Jens Schauder
+ * @author Mark Paluch
  */
 @Configuration
 @EnableJdbcRepositories
+@Import(JdbcConfiguration.class)
 public class CategoryConfiguration {
 
 	@Bean
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 40d3818e..0f2bddeb 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
@@ -18,18 +18,22 @@ package example.springdata.jdbc.mybatis;
 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.mybatis.MyBatisDataAccessStrategy;
 import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
+import org.springframework.data.jdbc.repository.config.JdbcConfiguration;
 import org.springframework.data.relational.core.conversion.RelationalConverter;
 import org.springframework.data.relational.core.mapping.RelationalMappingContext;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations;
 
 /**
  * @author Jens Schauder
+ * @author Mark Paluch
  */
 @Configuration
 @EnableJdbcRepositories
+@Import(JdbcConfiguration.class)
 public class MyBatisConfiguration {
 
 	@Bean