Created jOOQ Spring Boot Configuration and moved related classes to c…

…onfig package. Moved service types to service package.
jOOQ · Jul 14, 2015 · 1d63c5f · 1d63c5f
1 parent 783dc54
commit 1d63c5f
Show file tree

Hide file tree

Showing 8 changed files with 76 additions and 47 deletions.
diff --git a/...-examples/jOOQ-spring-boot-example/src/main/java/org/jooq/example/spring/Application.java b/...-examples/jOOQ-spring-boot-example/src/main/java/org/jooq/example/spring/Application.java
@@ -27,44 +27,4 @@ public static void main(String[] args) {
 		SpringApplication.run(Application.class, args);
 	}
 
-	@Bean
-	public DataSourceTransactionManager transactionManager(DataSource dataSource) {
-		return new DataSourceTransactionManager(dataSource);
-	}
-
-	@Bean
-	public DSLContext dsl(org.jooq.Configuration config) {
-		return new DefaultDSLContext(config);
-	}
-
-	@Bean
-	public ConnectionProvider connectionProvider(DataSource dataSource) {
-		return new DataSourceConnectionProvider(new TransactionAwareDataSourceProxy(dataSource));
-	}
-
-	@Bean
-	public TransactionProvider transactionProvider() {
-		return new SpringTransactionProvider();
-	}
-
-	@Bean
-	public ExceptionTranslator exceptionTranslator() {
-		return new ExceptionTranslator();
-	}
-
-	@Bean
-	public ExecuteListenerProvider executeListenerProvider(ExceptionTranslator exceptionTranslator) {
-		return new DefaultExecuteListenerProvider(exceptionTranslator);
-	}
-
-	@Bean
-	public org.jooq.Configuration jooqConfig(ConnectionProvider connectionProvider,
-			TransactionProvider transactionProvider, ExecuteListenerProvider executeListenerProvider) {
-
-		return new DefaultConfiguration() //
-				.derive(connectionProvider) //
-				.derive(transactionProvider) //
-				.derive(executeListenerProvider) //
-				.derive(SQLDialect.H2);
-	}
 }
diff --git a/...q/example/spring/ExceptionTranslator.java → ...le/spring/config/ExceptionTranslator.java b/...q/example/spring/ExceptionTranslator.java → ...le/spring/config/ExceptionTranslator.java
@@ -1,4 +1,4 @@
-package org.jooq.example.spring;
+package org.jooq.example.spring.config;
 
 import org.jooq.ExecuteContext;
 import org.jooq.SQLDialect;

diff --git a/...oot-example/src/main/java/org/jooq/example/spring/config/JooqSpringBootConfiguration.java b/...oot-example/src/main/java/org/jooq/example/spring/config/JooqSpringBootConfiguration.java
@@ -0,0 +1,65 @@
+package org.jooq.example.spring.config;
+
+import org.jooq.ConnectionProvider;
+import org.jooq.DSLContext;
+import org.jooq.ExecuteListenerProvider;
+import org.jooq.SQLDialect;
+import org.jooq.TransactionProvider;
+import org.jooq.impl.DataSourceConnectionProvider;
+import org.jooq.impl.DefaultConfiguration;
+import org.jooq.impl.DefaultDSLContext;
+import org.jooq.impl.DefaultExecuteListenerProvider;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.jdbc.datasource.TransactionAwareDataSourceProxy;
+
+import javax.sql.DataSource;
+
+/**
+ * @author Jacques Gonzalez
+ */
+@Configuration
+public class JooqSpringBootConfiguration {
+
+    @Bean
+    public DataSourceTransactionManager transactionManager(DataSource dataSource) {
+        return new DataSourceTransactionManager(dataSource);
+    }
+
+    @Bean
+    public DSLContext dsl(org.jooq.Configuration config) {
+        return new DefaultDSLContext(config);
+    }
+
+    @Bean
+    public ConnectionProvider connectionProvider(DataSource dataSource) {
+        return new DataSourceConnectionProvider(new TransactionAwareDataSourceProxy(dataSource));
+    }
+
+    @Bean
+    public TransactionProvider transactionProvider() {
+        return new SpringTransactionProvider();
+    }
+
+    @Bean
+    public ExceptionTranslator exceptionTranslator() {
+        return new ExceptionTranslator();
+    }
+
+    @Bean
+    public ExecuteListenerProvider executeListenerProvider(ExceptionTranslator exceptionTranslator) {
+        return new DefaultExecuteListenerProvider(exceptionTranslator);
+    }
+
+    @Bean
+    public org.jooq.Configuration jooqConfig(ConnectionProvider connectionProvider,
+                                             TransactionProvider transactionProvider, ExecuteListenerProvider executeListenerProvider) {
+
+        return new DefaultConfiguration() //
+                .derive(connectionProvider) //
+                .derive(transactionProvider) //
+                .derive(executeListenerProvider) //
+                .derive(SQLDialect.H2);
+    }
+}
diff --git a/...ooq/example/spring/SpringTransaction.java → ...mple/spring/config/SpringTransaction.java b/...ooq/example/spring/SpringTransaction.java → ...mple/spring/config/SpringTransaction.java
@@ -38,7 +38,7 @@
  *
  *
  */
-package org.jooq.example.spring;
+package org.jooq.example.spring.config;
 
 import org.jooq.Transaction;
 import org.springframework.transaction.TransactionStatus;

diff --git a/...ple/spring/SpringTransactionProvider.java → ...ing/config/SpringTransactionProvider.java b/...ple/spring/SpringTransactionProvider.java → ...ing/config/SpringTransactionProvider.java
@@ -38,7 +38,7 @@
  *
  *
  */
-package org.jooq.example.spring;
+package org.jooq.example.spring.config;
 
 import static org.springframework.transaction.TransactionDefinition.PROPAGATION_NESTED;
 

diff --git a/.../org/jooq/example/spring/BookService.java → ...q/example/spring/service/BookService.java b/.../org/jooq/example/spring/BookService.java → ...q/example/spring/service/BookService.java
@@ -38,7 +38,7 @@
  *
  *
  */
-package org.jooq.example.spring;
+package org.jooq.example.spring.service;
 
 import org.springframework.transaction.annotation.Transactional;
 

diff --git a/...oq/example/spring/DefaultBookService.java → ...le/spring/service/DefaultBookService.java b/...oq/example/spring/DefaultBookService.java → ...le/spring/service/DefaultBookService.java
@@ -1,4 +1,4 @@
-package org.jooq.example.spring;
+package org.jooq.example.spring.service;
 
 import static org.jooq.example.db.h2.Tables.BOOK;
 

diff --git a/...mples/jOOQ-spring-boot-example/src/test/java/org/jooq/example/spring/TransactionTest.java b/...mples/jOOQ-spring-boot-example/src/test/java/org/jooq/example/spring/TransactionTest.java
@@ -7,6 +7,8 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.jooq.DSLContext;
+import org.jooq.example.spring.config.SpringTransactionProvider;
+import org.jooq.example.spring.service.BookService;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Test;
@@ -34,8 +36,10 @@ public class TransactionTest {
 
 	@Autowired DSLContext dsl;
 	@Autowired DataSourceTransactionManager txMgr;
-	@Autowired SpringTransactionProvider txProvider;
+	@Autowired
-	@Autowired BookService books;
+	SpringTransactionProvider txProvider;
+	@Autowired
+	BookService books;
 
 	@After
 	public void teardown() {