Fix incorrect query intermittent results due to result list proxies (#379)

* Fix incorrect query intermittent results due to result list proxies

* remove legacy batch loader registry context

* make query result list streams and batch loaders thread safe

* Remove transactional from GraphQLController

* Auto-configure shared entity manager for graphql schema builder instance

Author: igdianov

.github/workflows/build.yml

@@ -3,11 +3,11 @@ name: CI
 on:
   workflow_dispatch:
   push:
-    branches: [ "master" ]
+    branches: [ "0.5.x" ]
     paths-ignore:
       - '**/README.md'  
   pull_request:
-    branches: [ "master" ]
+    branches: [ "0.5.x" ]
     paths-ignore:
       - '**/README.md'  
 

graphql-jpa-query-autoconfigure/pom.xml

@@ -32,6 +32,10 @@
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-autoconfigure</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-orm</artifactId>
+    </dependency>
     <dependency>
       <groupId>javax.validation</groupId>
       <artifactId>validation-api</artifactId>    

graphql-jpa-query-autoconfigure/src/main/java/com/introproventures/graphql/jpa/query/autoconfigure/GraphQLJpaQueryGraphQlExecutionAutoConfiguration.java

@@ -1,9 +1,6 @@
 package com.introproventures.graphql.jpa.query.autoconfigure;
 
 import graphql.GraphQL;
-import org.dataloader.DataLoaderOptions;
-import org.dataloader.MappedBatchLoaderWithContext;
-import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -13,9 +10,6 @@
 import org.springframework.graphql.ExecutionGraphQlService;
 import org.springframework.graphql.execution.BatchLoaderRegistry;
 import org.springframework.graphql.execution.GraphQlSource;
-import reactor.core.publisher.Mono;
-
-import static com.introproventures.graphql.jpa.query.schema.impl.BatchLoaderRegistry.newDataLoaderRegistry;
 
 @AutoConfiguration(after = GraphQlAutoConfiguration.class)
 @ConditionalOnClass({GraphQL.class, GraphQlSource.class})
@@ -35,20 +29,4 @@ ExecutionGraphQlService executionGraphQlService(ListableBeanFactory beanFactory,
         return new GraphQlAutoConfiguration(beanFactory).executionGraphQlService(graphQlSource,
                                                                                  batchLoaderRegistry);
     }
-
-    @Bean
-    InitializingBean batchLoaderRegistryConfigurer(BatchLoaderRegistry batchLoaderRegistry) {
-        return () -> {
-            DataLoaderOptions options = DataLoaderOptions.newOptions()
-                                                         .setCachingEnabled(false);
-            newDataLoaderRegistry(options)
-                               .getDataLoadersMap()
-                               .entrySet()
-                               .stream()
-                               .forEach(entry -> batchLoaderRegistry.forName(entry.getKey())
-                                                                    .withOptions(options)
-                                                                    .registerMappedBatchLoader((keys, env) ->
-                                                                           Mono.fromCompletionStage(((MappedBatchLoaderWithContext) entry.getValue()).load(keys, env))));
-        };
-    }
 }

graphql-jpa-query-autoconfigure/src/main/java/com/introproventures/graphql/jpa/query/autoconfigure/GraphQLSchemaBuilderAutoConfiguration.java

@@ -1,10 +1,11 @@
 package com.introproventures.graphql.jpa.query.autoconfigure;
 
-import javax.persistence.EntityManagerFactory;
 import com.introproventures.graphql.jpa.query.schema.GraphQLSchemaBuilder;
 import com.introproventures.graphql.jpa.query.schema.RestrictedKeysProvider;
 import com.introproventures.graphql.jpa.query.schema.impl.GraphQLJpaSchemaBuilder;
 import graphql.GraphQL;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -13,6 +14,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnSingleCandidate;
 import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
 import org.springframework.context.annotation.Bean;
+import org.springframework.orm.jpa.SharedEntityManagerCreator;
 
 @AutoConfiguration(
         before = {GraphQLSchemaAutoConfiguration.class, GraphQLJpaQueryGraphQlSourceAutoConfiguration.class},
@@ -28,7 +30,8 @@ public class GraphQLSchemaBuilderAutoConfiguration {
     GraphQLJpaSchemaBuilder defaultGraphQLJpaSchemaBuilder(EntityManagerFactory entityManagerFactory,
                                                            GraphQLJpaQueryProperties properties,
                                                            ObjectProvider<RestrictedKeysProvider> restrictedKeysProvider) {
-        GraphQLJpaSchemaBuilder builder = new GraphQLJpaSchemaBuilder(entityManagerFactory.createEntityManager());
+        EntityManager entityManager = SharedEntityManagerCreator.createSharedEntityManager(entityManagerFactory);
+        GraphQLJpaSchemaBuilder builder = new GraphQLJpaSchemaBuilder(entityManager);
 
         builder.name(properties.getName())
                .description(properties.getDescription())

graphql-jpa-query-autoconfigure/src/test/java/com/introproventures/graphql/jpa/query/autoconfigure/GraphQLSchemaAutoConfigurationTest.java

@@ -1,17 +1,15 @@
 package com.introproventures.graphql.jpa.query.autoconfigure;
 
-import java.io.File;
-import java.io.IOException;
-import java.time.Duration;
-import java.time.Instant;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
+import static graphql.annotations.AnnotationsSchemaCreator.newAnnotationsSchema;
+import static graphql.schema.FieldCoordinates.coordinates;
+import static graphql.schema.GraphQLCodeRegistry.newCodeRegistry;
+import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
+import static graphql.schema.GraphQLObjectType.newObject;
+import static graphql.schema.GraphQLSchema.newSchema;
+import static graphql.schema.idl.RuntimeWiring.newRuntimeWiring;
+import static java.util.Collections.emptyMap;
+import static org.assertj.core.api.Assertions.assertThat;
+
 import com.introproventures.graphql.jpa.query.autoconfigure.support.AdditionalGraphQLType;
 import com.introproventures.graphql.jpa.query.autoconfigure.support.MutationRoot;
 import com.introproventures.graphql.jpa.query.autoconfigure.support.QueryRoot;
@@ -41,6 +39,18 @@
 import graphql.schema.idl.SchemaGenerator;
 import graphql.schema.idl.SchemaParser;
 import graphql.schema.idl.TypeDefinitionRegistry;
+import java.io.File;
+import java.io.IOException;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.reactivestreams.Publisher;
@@ -58,16 +68,6 @@
 import reactor.core.publisher.Flux;
 import reactor.test.StepVerifier;
 
-import static graphql.annotations.AnnotationsSchemaCreator.newAnnotationsSchema;
-import static graphql.schema.FieldCoordinates.coordinates;
-import static graphql.schema.GraphQLCodeRegistry.newCodeRegistry;
-import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
-import static graphql.schema.GraphQLObjectType.newObject;
-import static graphql.schema.GraphQLSchema.newSchema;
-import static graphql.schema.idl.RuntimeWiring.newRuntimeWiring;
-import static java.util.Collections.emptyMap;
-import static org.assertj.core.api.Assertions.assertThat;
-
 @RunWith(SpringRunner.class)
 @SpringBootTest(webEnvironment=WebEnvironment.NONE)
 public class GraphQLSchemaAutoConfigurationTest {
@@ -77,11 +77,11 @@ public class GraphQLSchemaAutoConfigurationTest {
 
     @Autowired
     private GraphQLJpaQueryProperties graphQLJpaQueryProperties;
-    
+
     @SpringBootApplication
     @EnableGraphQLJpaQuerySchema(basePackageClasses = TestEntity.class)
     static class Application {
-        
+
         @Configuration
         static class GraphQLAnnotationsSchemaConfigurer implements GraphQLSchemaConfigurer {
             @Autowired(required = false)
@@ -383,6 +383,4 @@ public void defaultConfigurationProperties() {
         assertThat(graphQLJpaQueryProperties.isUseDistinctParameter()).isFalse();
         assertThat(graphQLJpaQueryProperties.isToManyDefaultOptional()).isTrue();
     }
-        
-
 }

graphql-jpa-query-boot-starter-graphql/src/test/java/com/introproventures/graphql/jpa/query/boot/test/boot/autoconfigure/GraphQLJpaQueryGraphQlSourceAutoConfigurationTest.java

@@ -15,14 +15,15 @@
  */
 package com.introproventures.graphql.jpa.query.boot.test.boot.autoconfigure;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import com.introproventures.graphql.jpa.query.autoconfigure.EnableGraphQLJpaQuerySchema;
 import com.introproventures.graphql.jpa.query.autoconfigure.JavaScalarsRuntimeWiringConfigurer;
 import com.introproventures.graphql.jpa.query.boot.test.starter.model.Author;
 import com.introproventures.graphql.jpa.query.schema.GraphQLSchemaBuilder;
 import com.introproventures.graphql.jpa.query.schema.impl.GraphQLJpaSchemaBuilder;
 import graphql.schema.GraphQLObjectType;
 import graphql.schema.GraphQLSchema;
-import org.dataloader.DataLoaderRegistry;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,10 +36,6 @@
 import org.springframework.graphql.execution.RuntimeWiringConfigurer;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import static graphql.GraphQLContext.newContext;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.dataloader.DataLoaderRegistry.newRegistry;
-
 @RunWith(SpringRunner.class)
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
 public class GraphQLJpaQueryGraphQlSourceAutoConfigurationTest {
@@ -81,11 +78,5 @@ public void contextIsAutoConfigured() {
                                 .extracting(GraphQLObjectType::getName, GraphQLObjectType::getDescription)
                                 .containsExactly("GraphQLBooks", "GraphQL Books Schema Description");
 
-        DataLoaderRegistry dataLoaderRegistry = newRegistry().build();
-        batchLoaderRegistry.registerDataLoaders(dataLoaderRegistry, newContext().build());
-
-        assertThat(dataLoaderRegistry.getDataLoadersMap())
-                                     .isNotEmpty()
-                                     .containsOnlyKeys("Author.books", "Book.author");
     }
-}
+}

graphql-jpa-query-build/pom.xml

@@ -20,7 +20,7 @@
     <repository>
       <id>spring-milestones</id>
       <name>Spring Milestones</name>
-      <url>http://repo.spring.io/milestone</url>
+      <url>https://repo.spring.io/milestone</url>
       <releases>
         <enabled>true</enabled>
       </releases>

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

@@ -17,25 +17,25 @@
 
 import static graphql.schema.visibility.DefaultGraphqlFieldVisibility.DEFAULT_FIELD_VISIBILITY;
 
+import graphql.GraphQLContext;
+import graphql.execution.instrumentation.Instrumentation;
+import graphql.execution.instrumentation.SimpleInstrumentation;
+import graphql.execution.instrumentation.tracing.TracingInstrumentation;
+import graphql.schema.visibility.BlockedFields;
+import graphql.schema.visibility.GraphqlFieldVisibility;
 import java.util.function.Supplier;
-
 import javax.servlet.http.HttpServletRequest;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Primary;
+import org.springframework.data.transaction.ChainedTransactionManager;
+import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.springframework.web.context.annotation.RequestScope;
 
-import graphql.GraphQLContext;
-import graphql.execution.instrumentation.Instrumentation;
-import graphql.execution.instrumentation.SimpleInstrumentation;
-import graphql.execution.instrumentation.tracing.TracingInstrumentation;
-import graphql.schema.visibility.BlockedFields;
-import graphql.schema.visibility.GraphqlFieldVisibility;
-
 /**
  * GraphQL JPA Query Example with Spring Boot Autoconfiguration
  * 
@@ -79,5 +79,13 @@ public Supplier<Instrumentation> instrumentation(HttpServletRequest request) {
                            ? new TracingInstrumentation() 
                            : SimpleInstrumentation.INSTANCE;
     }
-    
+
+
+    @Primary
+    PlatformTransactionManager transactionManager(
+        PlatformTransactionManager bookTransactionManager,
+        PlatformTransactionManager starWarsTransactionManager
+    ) {
+        return new ChainedTransactionManager(bookTransactionManager, starWarsTransactionManager);
+    }
 }