Fix auto configuration to use operation's default execution strategy delegate (#411)

Author: igdianov

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

@@ -6,6 +6,8 @@
 import com.introproventures.graphql.jpa.query.schema.RestrictedKeysProvider;
 import com.introproventures.graphql.jpa.query.schema.impl.GraphQLJpaSchemaBuilder;
 import graphql.GraphQL;
+import graphql.execution.AsyncExecutionStrategy;
+import graphql.execution.SubscriptionExecutionStrategy;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.EntityManagerFactory;
 import org.slf4j.Logger;
@@ -52,7 +54,8 @@ QueryExecutionStrategyProvider queryExecutionStrategy(
         var transactionTemplate = graphQLSchemaTransactionTemplate.get();
         transactionTemplate.setReadOnly(true);
 
-        var executionStrategy = newTransactionalExecutionStrategy(transactionTemplate);
+        var executionStrategy = newTransactionalExecutionStrategy(transactionTemplate)
+            .delegate(new AsyncExecutionStrategy());
 
         executionStrategyCustomizer.ifAvailable(customizer -> customizer.accept(executionStrategy));
 
@@ -69,7 +72,8 @@ MutationExecutionStrategyProvider mutationExecutionStrategy(
         var transactionTemplate = graphQLSchemaTransactionTemplate.get();
         transactionTemplate.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW);
 
-        var executionStrategy = newTransactionalExecutionStrategy(transactionTemplate);
+        var executionStrategy = newTransactionalExecutionStrategy(transactionTemplate)
+            .delegate(new AsyncExecutionStrategy());
 
         executionStrategyCustomizer.ifAvailable(customizer -> customizer.accept(executionStrategy));
 
@@ -85,8 +89,10 @@ SubscriptionExecutionStrategyProvider subscriptionExecutionStrategy(
     ) {
         var transactionTemplate = graphQLSchemaTransactionTemplate.get();
         transactionTemplate.setPropagationBehavior(TransactionDefinition.PROPAGATION_SUPPORTS);
+        transactionTemplate.setReadOnly(true);
 
-        var executionStrategy = newTransactionalExecutionStrategy(transactionTemplate);
+        var executionStrategy = newTransactionalExecutionStrategy(transactionTemplate)
+            .delegate(new SubscriptionExecutionStrategy());
 
         executionStrategyCustomizer.ifAvailable(customizer -> customizer.accept(executionStrategy));
 

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

@@ -28,6 +28,7 @@
 import graphql.annotations.annotationTypes.GraphQLName;
 import graphql.annotations.annotationTypes.directives.definition.GraphQLDirectiveDefinition;
 import graphql.execution.AsyncSerialExecutionStrategy;
+import graphql.execution.SubscriptionExecutionStrategy;
 import graphql.scalars.ExtendedScalars;
 import graphql.schema.DataFetcher;
 import graphql.schema.GraphQLCodeRegistry;
@@ -141,9 +142,7 @@ TransactionalExecutionStrategyCustomizer<SubscriptionExecutionStrategyProvider>
             return builder ->
                 builder
                     .executor(threadPoolTaskExecutor)
-                    .delegate(new AsyncSerialExecutionStrategy())
-                    .transactionTemplate(transactionTemplate -> transactionTemplate.setTimeout(999))
-                    .transactionTemplate(transactionTemplate -> transactionTemplate.setReadOnly(true));
+                    .transactionTemplate(transactionTemplate -> transactionTemplate.setTimeout(999));
         }
 
         @Configuration
@@ -508,7 +507,7 @@ void configuresSubscriptionTransactionalExecutionStrategyCustomizer() {
             .extracting(Supplier::get)
             .asInstanceOf(InstanceOfAssertFactories.type(TransactionalDelegateExecutionStrategy.class))
             .satisfies(result -> {
-                assertThat(result.getDelegate()).isInstanceOf(AsyncSerialExecutionStrategy.class);
+                assertThat(result.getDelegate()).isInstanceOf(SubscriptionExecutionStrategy.class);
                 assertThat(result.getExecutor()).extracting(Supplier::get).isInstanceOf(ThreadPoolTaskExecutor.class);
                 assertThat(result.getTransactionTemplate())
                     .extracting(DefaultTransactionDefinition::getTimeout)

tests/boot-starter/pom.xml

@@ -25,12 +25,17 @@
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-web</artifactId>
+      <artifactId>spring-boot-starter-webflux</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-data-jpa</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.h2database</groupId>
+      <artifactId>h2</artifactId>
+      <scope>runtime</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-test</artifactId>

tests/boot-starter/src/main/resources/application.yml

@@ -14,6 +14,8 @@ spring:
         name: GraphQLBooks
         description: GraphQL Books Schema Description
         enabled: true
+    websocket:
+      path: /graphql/ws
   sql:
     init:
       data-locations: