fix(GH-225): Configure shared entity manager for multiple data sources example (#228)

* fix: Propagate TxType.REQUIRES_NEW per request

* fix(example): configured shared entity manager proxy bean

Author: igdianov

graphql-jpa-query-example-merge/src/main/java/com/introproventures/graphql/jpa/query/example/books/BooksSchemaConfiguration.java

@@ -7,11 +7,6 @@
 import javax.persistence.EntityManagerFactory;
 import javax.sql.DataSource;
 
-import com.introproventures.graphql.jpa.query.autoconfigure.GraphQLJpaQueryProperties;
-import com.introproventures.graphql.jpa.query.autoconfigure.GraphQLSchemaConfigurer;
-import com.introproventures.graphql.jpa.query.autoconfigure.GraphQLShemaRegistration;
-import com.introproventures.graphql.jpa.query.schema.impl.GraphQLJpaSchemaBuilder;
-import com.introproventures.graphql.jpa.query.schema.model.book.Book;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.dialect.H2Dialect;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,6 +21,13 @@
 import org.springframework.jdbc.datasource.init.DataSourceInitializer;
 import org.springframework.jdbc.datasource.init.ResourceDatabasePopulator;
 import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+import org.springframework.orm.jpa.support.SharedEntityManagerBean;
+
+import com.introproventures.graphql.jpa.query.autoconfigure.GraphQLJpaQueryProperties;
+import com.introproventures.graphql.jpa.query.autoconfigure.GraphQLSchemaConfigurer;
+import com.introproventures.graphql.jpa.query.autoconfigure.GraphQLShemaRegistration;
+import com.introproventures.graphql.jpa.query.schema.impl.GraphQLJpaSchemaBuilder;
+import com.introproventures.graphql.jpa.query.schema.model.book.Book;
 
 @Configuration
 public class BooksSchemaConfiguration {
@@ -39,7 +41,6 @@ public DataSource bookDataSource() {
     }    
 
     @Bean
-    @Qualifier("bookEntityManager")
     public LocalContainerEntityManagerFactoryBean bookEntityManagerFactory(
             EntityManagerFactoryBuilder builder) {
         Map<String, Object> properties = new HashMap<>();
@@ -71,6 +72,14 @@ public DataSourceInitializer booksDataSourceInitializer(@Qualifier("bookDataSour
         return dataSourceInitializer;
     }
 
+    
+    @Bean 
+    public SharedEntityManagerBean bookEntityManager(EntityManagerFactory bookEntityManagerFactory) {
+        SharedEntityManagerBean bean =  new SharedEntityManagerBean();
+        bean.setEntityManagerFactory(bookEntityManagerFactory);
+        
+        return bean;
+    }
 
     @Configuration
     public static class GraphQLJpaQuerySchemaConfigurer implements GraphQLSchemaConfigurer {
@@ -80,8 +89,8 @@ public static class GraphQLJpaQuerySchemaConfigurer implements GraphQLSchemaConf
         @Autowired
         private GraphQLJpaQueryProperties properties;
 
-        public GraphQLJpaQuerySchemaConfigurer(@Qualifier("bookEntityManager") EntityManagerFactory entityManager) {
-            this.entityManager = entityManager.createEntityManager();
+        public GraphQLJpaQuerySchemaConfigurer(EntityManager bookEntityManager) {
+            this.entityManager = bookEntityManager;
         }
 
         @Override

graphql-jpa-query-example-merge/src/main/java/com/introproventures/graphql/jpa/query/example/starwars/StarwarsSchemaConfiguration.java

@@ -7,10 +7,6 @@
 import javax.persistence.EntityManagerFactory;
 import javax.sql.DataSource;
 
-import com.introproventures.graphql.jpa.query.autoconfigure.GraphQLSchemaConfigurer;
-import com.introproventures.graphql.jpa.query.autoconfigure.GraphQLShemaRegistration;
-import com.introproventures.graphql.jpa.query.schema.impl.GraphQLJpaSchemaBuilder;
-import com.introproventures.graphql.jpa.query.schema.model.starwars.Droid;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.dialect.H2Dialect;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -25,6 +21,12 @@
 import org.springframework.jdbc.datasource.init.DataSourceInitializer;
 import org.springframework.jdbc.datasource.init.ResourceDatabasePopulator;
 import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+import org.springframework.orm.jpa.support.SharedEntityManagerBean;
+
+import com.introproventures.graphql.jpa.query.autoconfigure.GraphQLSchemaConfigurer;
+import com.introproventures.graphql.jpa.query.autoconfigure.GraphQLShemaRegistration;
+import com.introproventures.graphql.jpa.query.schema.impl.GraphQLJpaSchemaBuilder;
+import com.introproventures.graphql.jpa.query.schema.model.starwars.Droid;
 
 @Configuration
 public class StarwarsSchemaConfiguration {
@@ -38,7 +40,7 @@ public DataSource starWarsDataSource() {
     }    
 
     @Bean
-    public DataSourceInitializer starWarsDataSourceInitializer(@Qualifier("starWarsDataSource") DataSource starWarsDataSource) {
+    public DataSourceInitializer starWarsDataSourceInitializer(DataSource starWarsDataSource) {
         DataSourceInitializer dataSourceInitializer = new DataSourceInitializer();
         ResourceLoader resourceLoader = new DefaultResourceLoader();
 
@@ -54,7 +56,6 @@ public DataSourceInitializer starWarsDataSourceInitializer(@Qualifier("starWarsD
 
     @Bean
     @Primary
-    @Qualifier("starWarsEntityManager")
     public LocalContainerEntityManagerFactoryBean starWarsEntityManagerFactory(
             EntityManagerFactoryBuilder builder) {
 
@@ -73,13 +74,20 @@ public LocalContainerEntityManagerFactoryBean starWarsEntityManagerFactory(
                 .build();
     }    
 
+    @Bean 
+    public SharedEntityManagerBean starWarsEntityManager(EntityManagerFactory entityManager) {
+        SharedEntityManagerBean bean =  new SharedEntityManagerBean();
+        bean.setEntityManagerFactory(entityManager);
+        
+        return bean;
+    }    
     @Configuration
     public static class GraphQLJpaQuerySchemaConfigurer implements GraphQLSchemaConfigurer {
 
         private final EntityManager entityManager;
 
-        public GraphQLJpaQuerySchemaConfigurer(@Qualifier("starWarsEntityManager") EntityManagerFactory entityManager) {
-            this.entityManager = entityManager.createEntityManager();
+        public GraphQLJpaQuerySchemaConfigurer(EntityManager starWarsEntityManager) {
+            this.entityManager = starWarsEntityManager;
         }
 
         @Override

graphql-jpa-query-schema/src/main/java/com/introproventures/graphql/jpa/query/schema/impl/GraphQLJpaExecutor.java

@@ -23,6 +23,7 @@
 import javax.transaction.Transactional.TxType;
 
 import com.introproventures.graphql.jpa.query.schema.GraphQLExecutor;
+
 import graphql.ExecutionInput;
 import graphql.ExecutionResult;
 import graphql.GraphQL;
@@ -52,7 +53,7 @@ public GraphQLJpaExecutor(GraphQLSchema graphQLSchema) {
      * @see org.activiti.services.query.qraphql.jpa.QraphQLExecutor#execute(java.lang.String)
      */
     @Override
-    @Transactional(TxType.SUPPORTS)
+    @Transactional(TxType.REQUIRES_NEW)
     public ExecutionResult execute(String query) {
         return execute(query, Collections.emptyMap());
     }
@@ -61,7 +62,7 @@ public ExecutionResult execute(String query) {
      * @see org.activiti.services.query.qraphql.jpa.QraphQLExecutor#execute(java.lang.String, java.util.Map)
      */
     @Override
-    @Transactional(TxType.SUPPORTS)
+    @Transactional(TxType.REQUIRES_NEW)
     public ExecutionResult execute(String query, Map<String, Object> arguments) {
 
     	ExecutionInput executionInput = ExecutionInput.newExecutionInput()