Skip to content

Commit 7146699

Browse files
committed
fix(test): corrected failing public class GraphQLJpaQueryAutoConfigurationTest {
1 parent 4110f70 commit 7146699

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

graphql-jpa-query-boot-starter/src/main/java/com/introproventures/graphql/jpa/query/boot/autoconfigure/GraphQLJpaQueryAutoConfiguration.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
2323
import org.springframework.context.annotation.Bean;
2424
import org.springframework.context.annotation.Configuration;
25-
import org.springframework.web.context.annotation.RequestScope;
26-
import org.springframework.web.context.annotation.SessionScope;
2725

2826
import com.introproventures.graphql.jpa.query.autoconfigure.GraphQLSchemaConfigurer;
2927
import com.introproventures.graphql.jpa.query.autoconfigure.GraphQLShemaRegistration;
@@ -62,14 +60,12 @@ public void configure(GraphQLShemaRegistration registry) {
6260
public static class DefaultGraphQLJpaQueryConfiguration {
6361

6462
@Bean
65-
@RequestScope
6663
@ConditionalOnMissingBean
6764
public GraphQLExecutionInputFactory graphQLExecutionInputFactory() {
6865
return new GraphQLExecutionInputFactory() { };
6966
}
7067

7168
@Bean
72-
@SessionScope
7369
@ConditionalOnMissingBean
7470
public GraphQLExecutorContextFactory graphQLExecutorContextFactory(GraphQLExecutionInputFactory graphQLExecutionInputFactory) {
7571
return new GraphQLJpaExecutorContextFactory(graphQLExecutionInputFactory);

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

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@
2626
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
2727
import org.springframework.test.context.junit4.SpringRunner;
2828

29+
import com.introproventures.graphql.jpa.query.schema.GraphQLExecutionInputFactory;
2930
import com.introproventures.graphql.jpa.query.schema.GraphQLExecutor;
31+
import com.introproventures.graphql.jpa.query.schema.GraphQLExecutorContextFactory;
3032
import com.introproventures.graphql.jpa.query.schema.GraphQLSchemaBuilder;
3133
import com.introproventures.graphql.jpa.query.schema.impl.GraphQLJpaExecutor;
3234
import com.introproventures.graphql.jpa.query.schema.impl.GraphQLJpaExecutorContextFactory;
@@ -52,8 +54,11 @@ static class Application {
5254
private GraphQLSchemaBuilder graphQLSchemaBuilder;
5355

5456
@Autowired(required=false)
55-
private GraphQLJpaExecutorContextFactory executorContextFactory;
57+
private GraphQLExecutorContextFactory executorContextFactory;
5658

59+
@Autowired(required=false)
60+
private GraphQLExecutionInputFactory executionInputFactory;
61+
5762
@Autowired
5863
private GraphQLSchema graphQLSchema;
5964

@@ -65,7 +70,11 @@ public void contextIsAutoConfigured() {
6570
assertThat(graphQLSchemaBuilder).isNotNull()
6671
.isInstanceOf(GraphQLJpaSchemaBuilder.class);
6772

68-
assertThat(executorContextFactory).isNotNull();
73+
assertThat(executorContextFactory).isNotNull()
74+
.isInstanceOf(GraphQLJpaExecutorContextFactory.class);
75+
76+
assertThat(executionInputFactory).isNotNull()
77+
.isInstanceOf(GraphQLExecutionInputFactory.class);
6978

7079
assertThat(graphQLSchema.getQueryType())
7180
.extracting(GraphQLObjectType::getName, GraphQLObjectType::getDescription)

0 commit comments

Comments
 (0)