refactor(executor): extracted context and input factory interfaces

Author: igdianov

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

@@ -22,10 +22,14 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.web.context.annotation.RequestScope;
+import org.springframework.web.context.annotation.SessionScope;
 
 import com.introproventures.graphql.jpa.query.autoconfigure.GraphQLSchemaConfigurer;
 import com.introproventures.graphql.jpa.query.autoconfigure.GraphQLShemaRegistration;
+import com.introproventures.graphql.jpa.query.schema.GraphQLExecutionInputFactory;
 import com.introproventures.graphql.jpa.query.schema.GraphQLExecutor;
+import com.introproventures.graphql.jpa.query.schema.GraphQLExecutorContextFactory;
 import com.introproventures.graphql.jpa.query.schema.GraphQLSchemaBuilder;
 import com.introproventures.graphql.jpa.query.schema.impl.GraphQLJpaExecutor;
 import com.introproventures.graphql.jpa.query.schema.impl.GraphQLJpaExecutorContextFactory;
@@ -56,23 +60,31 @@ public void configure(GraphQLShemaRegistration registry) {
 
     @Configuration
     public static class DefaultGraphQLJpaQueryConfiguration {
+
+        @Bean 
+        @RequestScope
+        @ConditionalOnMissingBean
+        public GraphQLExecutionInputFactory graphQLExecutionInputFactory() {
+            return new GraphQLExecutionInputFactory() { };
+        }
 
         @Bean 
-        @ConditionalOnMissingBean(GraphQLJpaExecutorContextFactory.class)
-        public GraphQLJpaExecutorContextFactory graphQLExecutorContextFactory() {
-            return new GraphQLJpaExecutorContextFactory() { };
+        @SessionScope
+        @ConditionalOnMissingBean
+        public GraphQLExecutorContextFactory graphQLExecutorContextFactory(GraphQLExecutionInputFactory graphQLExecutionInputFactory) {
+            return new GraphQLJpaExecutorContextFactory(graphQLExecutionInputFactory);
         }
 
         @Bean
-        @ConditionalOnMissingBean(GraphQLExecutor.class)
+        @ConditionalOnMissingBean
         public GraphQLExecutor graphQLExecutor(GraphQLSchema graphQLSchema,
-                                               GraphQLJpaExecutorContextFactory graphQLExecutorContextFactory) {
+                                               GraphQLExecutorContextFactory graphQLExecutorContextFactory) {
             return new GraphQLJpaExecutor(graphQLSchema,
                                           graphQLExecutorContextFactory);
         }
 
         @Bean
-        @ConditionalOnMissingBean(GraphQLSchemaBuilder.class)
+        @ConditionalOnMissingBean
         public GraphQLSchemaBuilder graphQLSchemaBuilder(final EntityManager entityManager) {
             return new GraphQLJpaSchemaBuilder(entityManager);
         }

graphql-jpa-query-schema/src/main/java/com/introproventures/graphql/jpa/query/schema/GraphQLExecutionInputFactory.java

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2017 IntroPro Ventures Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.introproventures.graphql.jpa.query.schema;
+
+import graphql.ExecutionInput;
+
+public interface GraphQLExecutionInputFactory {
+
+    default ExecutionInput.Builder create() {
+        return ExecutionInput.newExecutionInput();
+    };
+
+}

graphql-jpa-query-schema/src/main/java/com/introproventures/graphql/jpa/query/schema/GraphQLExecutorContext.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright 2017 IntroPro Ventures Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.introproventures.graphql.jpa.query.schema;
+
+import java.util.Optional;
+import java.util.function.Consumer;
+
+import graphql.ExecutionInput;
+import graphql.execution.instrumentation.Instrumentation;
+import graphql.schema.GraphQLSchema;
+
+public interface GraphQLExecutorContext {
+    
+    ExecutionInput.Builder newExecutionInput();
+
+    default Optional<Consumer<GraphQLSchema.Builder>> schemaBuilder(GraphQLSchema schema) {
+        return Optional.empty();
+    }
+    
+    default Optional<Instrumentation> instrumentation() {
+        return Optional.empty();
+    }
+    
+}

graphql-jpa-query-schema/src/main/java/com/introproventures/graphql/jpa/query/schema/GraphQLExecutorContextFactory.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2017 IntroPro Ventures Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.introproventures.graphql.jpa.query.schema;
+
+public interface GraphQLExecutorContextFactory {
+
+    GraphQLExecutorContext newExecutorContext();
+
+}

graphql-jpa-query-schema/src/main/java/com/introproventures/graphql/jpa/query/schema/impl/GraphQLJpaExecutor.java

@@ -23,6 +23,8 @@
 import javax.transaction.Transactional.TxType;
 
 import com.introproventures.graphql.jpa.query.schema.GraphQLExecutor;
+import com.introproventures.graphql.jpa.query.schema.GraphQLExecutorContext;
+import com.introproventures.graphql.jpa.query.schema.GraphQLExecutorContextFactory;
 
 import graphql.ExecutionInput;
 import graphql.ExecutionResult;
@@ -40,7 +42,7 @@ public class GraphQLJpaExecutor implements GraphQLExecutor {
 
     private final GraphQLSchema graphQLSchema;
 
-    private final GraphQLJpaExecutorContextFactory contextFactory;
+    private final GraphQLExecutorContextFactory contextFactory;
 
     /**
      * Creates instance using GraphQLSchema parameter with default GraphQLJpaExecutorContextFactory
@@ -58,7 +60,7 @@ public GraphQLJpaExecutor(GraphQLSchema graphQLSchema) {
      * @param GraphQLJpaExecutorContextFactory contextFactory
      */
     public GraphQLJpaExecutor(GraphQLSchema graphQLSchema,
-                              GraphQLJpaExecutorContextFactory contextFactory) {
+                              GraphQLExecutorContextFactory contextFactory) {
         this.graphQLSchema = graphQLSchema;
         this.contextFactory = contextFactory;
     }
@@ -79,29 +81,22 @@ public ExecutionResult execute(String query) {
     @Override
     @Transactional(TxType.SUPPORTS)
     public ExecutionResult execute(String query, Map<String, Object> arguments) {
+        
+        GraphQLExecutorContext executorContext = contextFactory.newExecutorContext();
 
-        GraphQLJpaExecutorContext executorContext = contextFactory.create();
-
-        GraphQLSchema schema = executorContext.graphQLFieldVisibility()
-                                              .map(graphQLFieldVisibility -> 
-                                                   graphQLSchema.transform(builder -> 
-                                                                           builder.fieldVisibility(graphQLFieldVisibility)))
-                                              .orElse(graphQLSchema);
+        ExecutionInput.Builder executionInput = executorContext.newExecutionInput()
+                                                               .query(query)
+                                                               .variables(arguments);        
 
+        GraphQLSchema schema = executorContext.schemaBuilder(graphQLSchema)
+                                              .map(graphQLSchema::transform)
+                                              .orElse(graphQLSchema);
+
         GraphQL.Builder graphQL = GraphQL.newGraphQL(schema);
 
-        executorContext.getInstrumentation()
+        executorContext.instrumentation()
                        .ifPresent(graphQL::instrumentation);
 
-        ExecutionInput.Builder executionInput = ExecutionInput.newExecutionInput()
-                                                              .query(query)
-                                                              .variables(arguments);
-        executorContext.getExecutionContext()
-                       .ifPresent(executionInput::context);
-
-        executorContext.getExecutionRoot()
-                       .ifPresent(executionInput::root);
-        
         return graphQL.build()
                       .execute(executionInput);
     }

graphql-jpa-query-schema/src/main/java/com/introproventures/graphql/jpa/query/schema/impl/GraphQLJpaExecutorContext.java

@@ -1,26 +1,37 @@
+/*
+ * Copyright 2017 IntroPro Ventures Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.introproventures.graphql.jpa.query.schema.impl;
 
-import java.util.Optional;
+import com.introproventures.graphql.jpa.query.schema.GraphQLExecutionInputFactory;
+import com.introproventures.graphql.jpa.query.schema.GraphQLExecutorContext;
 
-import graphql.execution.instrumentation.Instrumentation;
-import graphql.schema.visibility.GraphqlFieldVisibility;
+import graphql.ExecutionInput;
 
-public interface GraphQLJpaExecutorContext {
+public class GraphQLJpaExecutorContext implements GraphQLExecutorContext {
 
-    default Optional<GraphqlFieldVisibility> graphQLFieldVisibility() {
-        return Optional.empty();
-    };
+    private final GraphQLExecutionInputFactory factory;
 
-    default Optional<Object> getExecutionContext() {
-        return Optional.empty();
-    }
-
-    default Optional<Object> getExecutionRoot() {
-        return Optional.empty();
+    public GraphQLJpaExecutorContext(GraphQLExecutionInputFactory factory) {
+        this.factory = factory;
     }
 
-    default Optional<Instrumentation> getInstrumentation() {
-        return Optional.empty();
+    @Override
+    public ExecutionInput.Builder newExecutionInput() {
+        return factory.create();
     }
 
 }

graphql-jpa-query-schema/src/main/java/com/introproventures/graphql/jpa/query/schema/impl/GraphQLJpaExecutorContextFactory.java

@@ -1,10 +1,40 @@
-package com.introproventures.graphql.jpa.query.schema.impl;
+/*
+ * Copyright 2017 IntroPro Ventures Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
+package com.introproventures.graphql.jpa.query.schema.impl;
 
-public interface GraphQLJpaExecutorContextFactory {
+import com.introproventures.graphql.jpa.query.schema.GraphQLExecutionInputFactory;
+import com.introproventures.graphql.jpa.query.schema.GraphQLExecutorContext;
+import com.introproventures.graphql.jpa.query.schema.GraphQLExecutorContextFactory;
 
-    default GraphQLJpaExecutorContext create() {
-        return new GraphQLJpaExecutorContext() { };
+public class GraphQLJpaExecutorContextFactory implements GraphQLExecutorContextFactory {
+    
+    private final GraphQLExecutionInputFactory factory;
+    
+    public GraphQLJpaExecutorContextFactory() {
+        this(new GraphQLExecutionInputFactory() {});
+    }
+    
+    public GraphQLJpaExecutorContextFactory(GraphQLExecutionInputFactory factory) {
+        this.factory = factory;
+    }
+    
+    @Override
+    public GraphQLExecutorContext newExecutorContext() {
+        return new GraphQLJpaExecutorContext(factory);
     };
 
 }