fix(GH-225): Fixed regression with missing @Qualifier on EntityManager (#230)

Author: igdianov

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

@@ -41,6 +41,7 @@ public DataSource bookDataSource() {
     }    
 
     @Bean
+    @Qualifier("bookEntityManagerFactory")
     public LocalContainerEntityManagerFactoryBean bookEntityManagerFactory(
             EntityManagerFactoryBuilder builder) {
         Map<String, Object> properties = new HashMap<>();
@@ -73,8 +74,9 @@ public DataSourceInitializer booksDataSourceInitializer(@Qualifier("bookDataSour
     }
 
 
-    @Bean 
-    public SharedEntityManagerBean bookEntityManager(EntityManagerFactory bookEntityManagerFactory) {
+    @Bean
+    @Qualifier("bookEntityManager")
+    public SharedEntityManagerBean bookEntityManager(@Qualifier("bookEntityManagerFactory") EntityManagerFactory bookEntityManagerFactory) {
         SharedEntityManagerBean bean =  new SharedEntityManagerBean();
         bean.setEntityManagerFactory(bookEntityManagerFactory);
 
@@ -89,7 +91,7 @@ public static class GraphQLJpaQuerySchemaConfigurer implements GraphQLSchemaConf
         @Autowired
         private GraphQLJpaQueryProperties properties;
 
-        public GraphQLJpaQuerySchemaConfigurer(EntityManager bookEntityManager) {
+        public GraphQLJpaQuerySchemaConfigurer(@Qualifier("bookEntityManager") EntityManager bookEntityManager) {
             this.entityManager = bookEntityManager;
         }
 

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

@@ -40,7 +40,7 @@ public DataSource starWarsDataSource() {
     }    
 
     @Bean
-    public DataSourceInitializer starWarsDataSourceInitializer(DataSource starWarsDataSource) {
+    public DataSourceInitializer starWarsDataSourceInitializer(@Qualifier("starWarsDataSource") DataSource starWarsDataSource) {
         DataSourceInitializer dataSourceInitializer = new DataSourceInitializer();
         ResourceLoader resourceLoader = new DefaultResourceLoader();
 
@@ -56,6 +56,7 @@ public DataSourceInitializer starWarsDataSourceInitializer(DataSource starWarsDa
 
     @Bean
     @Primary
+    @Qualifier("starWarsEntityManagerFactory")
     public LocalContainerEntityManagerFactoryBean starWarsEntityManagerFactory(
             EntityManagerFactoryBuilder builder) {
 
@@ -75,7 +76,8 @@ public LocalContainerEntityManagerFactoryBean starWarsEntityManagerFactory(
     }    
 
     @Bean 
-    public SharedEntityManagerBean starWarsEntityManager(EntityManagerFactory entityManager) {
+    @Qualifier("starWarsEntityManager")
+    public SharedEntityManagerBean starWarsEntityManager(@Qualifier("starWarsEntityManagerFactory") EntityManagerFactory entityManager) {
         SharedEntityManagerBean bean =  new SharedEntityManagerBean();
         bean.setEntityManagerFactory(entityManager);
 
@@ -86,7 +88,7 @@ public static class GraphQLJpaQuerySchemaConfigurer implements GraphQLSchemaConf
 
         private final EntityManager entityManager;
 
-        public GraphQLJpaQuerySchemaConfigurer(EntityManager starWarsEntityManager) {
+        public GraphQLJpaQuerySchemaConfigurer(@Qualifier("starWarsEntityManager") EntityManager starWarsEntityManager) {
             this.entityManager = starWarsEntityManager;
         }