Skip to content
This repository was archived by the owner on Dec 19, 2023. It is now read-only.

Commit eff9dbd

Browse files
committed
Removed transactional property
1 parent 0715368 commit eff9dbd

File tree

5 files changed

+119
-296
lines changed

5 files changed

+119
-296
lines changed

graphql-spring-boot-autoconfigure/src/main/java/com/oembedler/moon/graphql/boot/GraphQLQueryInvokerProperties.java

Lines changed: 0 additions & 13 deletions
This file was deleted.

graphql-spring-boot-autoconfigure/src/main/java/com/oembedler/moon/graphql/boot/GraphQLWebAutoConfiguration.java

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
@Conditional(OnSchemaOrSchemaProviderBean.class)
8787
@ConditionalOnProperty(value = "graphql.servlet.enabled", havingValue = "true", matchIfMissing = true)
8888
@AutoConfigureAfter({GraphQLJavaToolsAutoConfiguration.class, JacksonAutoConfiguration.class})
89-
@EnableConfigurationProperties({GraphQLServletProperties.class, GraphQLQueryInvokerProperties.class})
89+
@EnableConfigurationProperties({GraphQLServletProperties.class})
9090
public class GraphQLWebAutoConfiguration {
9191

9292

@@ -216,18 +216,16 @@ public GraphQLInvocationInputFactory invocationInputFactory(GraphQLSchemaServlet
216216
return builder.build();
217217
}
218218

219-
@Bean
220-
@ConditionalOnMissingBean
221-
public GraphQLQueryInvoker queryInvoker(
222-
ExecutionStrategyProvider executionStrategyProvider,
223-
GraphQLQueryInvokerProperties graphQLQueryInvokerProperties
224-
) {
225-
GraphQLQueryInvoker.Builder builder = GraphQLQueryInvoker.newBuilder()
226-
.withExecutionStrategyProvider(executionStrategyProvider);
219+
@Bean
220+
@ConditionalOnMissingBean
221+
public GraphQLQueryInvoker queryInvoker(
222+
ExecutionStrategyProvider executionStrategyProvider
223+
) {
224+
GraphQLQueryInvoker.Builder builder = GraphQLQueryInvoker.newBuilder()
225+
.withExecutionStrategyProvider(executionStrategyProvider);
227226

228227
if (instrumentations != null) {
229-
230-
//Metrics instrumentation should be the last to run (we need that from TracingInstrumentation)
228+
// Metrics instrumentation should be the last to run (we need that from TracingInstrumentation)
231229
instrumentations.sort((a, b) -> a instanceof MetricsInstrumentation ? 1 : 0);
232230
builder.with(instrumentations);
233231
}
@@ -236,14 +234,8 @@ public GraphQLQueryInvoker queryInvoker(
236234
builder.withPreparsedDocumentProvider(preparsedDocumentProvider);
237235
}
238236

239-
GraphQLQueryInvoker queryInvoker = builder.build();
240-
241-
if (graphQLQueryInvokerProperties.isTransactional()) {
242-
queryInvoker = new TransactionalGraphQLQueryInvokerWrapper(queryInvoker);
243-
log.info("Using transactional query invoker.");
244-
}
245-
return queryInvoker;
246-
}
237+
return builder.build();
238+
}
247239

248240
@Bean
249241
@ConditionalOnMissingBean

graphql-spring-boot-autoconfigure/src/main/java/com/oembedler/moon/graphql/boot/TransactionalGraphQLQueryInvokerWrapper.java

Lines changed: 0 additions & 58 deletions
This file was deleted.

graphql-spring-boot-autoconfigure/src/test/java/com/oembedler/moon/graphql/boot/TransactionQueryInvokerWrapperTest.java

Lines changed: 0 additions & 74 deletions
This file was deleted.

0 commit comments

Comments
 (0)