feat: use Optional.empty() in GraphQLJpaExecutorContext default implementation

Author: igdianov

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

@@ -82,12 +82,16 @@ public ExecutionResult execute(String query, Map<String, Object> arguments) {
 
         GraphQLJpaExecutorContext executorContext = contextFactory.create();
 
-        GraphQLSchema schema = graphQLSchema.transform(builder -> 
-                                                       builder.fieldVisibility(executorContext.graphQLFieldVisibility()));
+        GraphQLSchema schema = executorContext.graphQLFieldVisibility()
+                                              .map(graphQLFieldVisibility -> 
+                                                   graphQLSchema.transform(builder -> 
+                                                                           builder.fieldVisibility(graphQLFieldVisibility)))
+                                              .orElse(graphQLSchema);
 
-        GraphQL graphQL = GraphQL.newGraphQL(schema)
-                                 .instrumentation(executorContext.getInstrumentation())
-                                 .build();
+        GraphQL.Builder graphQL = GraphQL.newGraphQL(schema);
+        
+        executorContext.getInstrumentation()
+                       .ifPresent(graphQL::instrumentation);
 
         ExecutionInput.Builder executionInput = ExecutionInput.newExecutionInput()
                                                               .query(query)
@@ -98,7 +102,8 @@ public ExecutionResult execute(String query, Map<String, Object> arguments) {
         executorContext.getExecutionRoot()
                        .ifPresent(executionInput::root);
 
-        return graphQL.execute(executionInput);
+        return graphQL.build()
+                      .execute(executionInput);
     }
 
 }

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

@@ -3,14 +3,12 @@
 import java.util.Optional;
 
 import graphql.execution.instrumentation.Instrumentation;
-import graphql.execution.instrumentation.SimpleInstrumentation;
-import graphql.schema.visibility.DefaultGraphqlFieldVisibility;
 import graphql.schema.visibility.GraphqlFieldVisibility;
 
 public interface GraphQLJpaExecutorContext {
 
-    default GraphqlFieldVisibility graphQLFieldVisibility() {
-        return new DefaultGraphqlFieldVisibility();
+    default Optional<GraphqlFieldVisibility> graphQLFieldVisibility() {
+        return Optional.empty();
     };
 
     default Optional<Object> getExecutionContext() {
@@ -21,8 +19,8 @@ default Optional<Object> getExecutionRoot() {
         return Optional.empty();
     }
 
-    default Instrumentation getInstrumentation() {
-        return new SimpleInstrumentation();
+    default Optional<Instrumentation> getInstrumentation() {
+        return Optional.empty();
     }
 
 }