Increase coverage and fix sonar issues in osgi

Author: oliemansm

graphql-java-servlet/src/main/java/graphql/kickstart/servlet/osgi/GraphQLQueryProvider.java

@@ -13,8 +13,4 @@ public interface GraphQLQueryProvider extends GraphQLProvider {
    */
   Collection<GraphQLFieldDefinition> getQueries();
 
-  default Collection<GraphQLFieldDefinition> getFields() {
-    return getQueries();
-  }
-
 }

graphql-java-servlet/src/test/groovy/graphql/kickstart/servlet/OsgiGraphQLHttpServletSpec.groovy

@@ -4,13 +4,19 @@ import graphql.AssertException
 import graphql.annotations.annotationTypes.GraphQLField
 import graphql.annotations.annotationTypes.GraphQLName
 import graphql.annotations.processor.GraphQLAnnotations
+import graphql.execution.instrumentation.Instrumentation
+import graphql.execution.instrumentation.InstrumentationState
+import graphql.execution.instrumentation.SimpleInstrumentation
+import graphql.execution.instrumentation.parameters.InstrumentationCreateStateParameters
 import graphql.kickstart.execution.GraphQLRequest
 import graphql.kickstart.execution.config.ExecutionStrategyProvider
+import graphql.kickstart.execution.config.InstrumentationProvider
 import graphql.kickstart.execution.context.DefaultGraphQLContext
 import graphql.kickstart.execution.context.GraphQLContext
 import graphql.kickstart.servlet.context.GraphQLServletContextBuilder
 import graphql.kickstart.servlet.core.GraphQLServletListener
 import graphql.kickstart.servlet.core.GraphQLServletRootObjectBuilder
+import graphql.kickstart.servlet.input.NoOpBatchInputPreProcessor
 import graphql.kickstart.servlet.osgi.*
 import graphql.schema.*
 import org.dataloader.DataLoaderRegistry
@@ -25,19 +31,19 @@ class OsgiGraphQLHttpServletSpec extends Specification {
 
         @Override
         Collection<GraphQLFieldDefinition> getQueries() {
-            List<GraphQLFieldDefinition> fieldDefinitions = new ArrayList<>();
+            List<GraphQLFieldDefinition> fieldDefinitions = new ArrayList<>()
             fieldDefinitions.add(newFieldDefinition()
                     .name("query")
                     .type(new GraphQLAnnotations().object(Query.class))
                     .staticValue(new Query())
-                    .build());
-            return fieldDefinitions;
+                    .build())
+            return fieldDefinitions
         }
 
         @GraphQLName("query")
         static class Query {
             @GraphQLField
-            public String field;
+            public String field
         }
 
     }
@@ -55,15 +61,15 @@ class OsgiGraphQLHttpServletSpec extends Specification {
         query.getType().name == "query"
 
         when:
-        query = servlet.getConfiguration().getInvocationInputFactory().getSchemaProvider().getReadOnlySchema(null).getQueryType().getFieldDefinition("query")
+        query = servlet.getConfiguration().getInvocationInputFactory().getSchemaProvider().getReadOnlySchema().getQueryType().getFieldDefinition("query")
         then:
         query.getType().name == "query"
 
         when:
         servlet.unbindQueryProvider(queryProvider)
         then:
         servlet.getConfiguration().getInvocationInputFactory().getSchemaProvider().getSchema().getQueryType().getFieldDefinitions().get(0).name == "_empty"
-        servlet.getConfiguration().getInvocationInputFactory().getSchemaProvider().getReadOnlySchema(null).getQueryType().getFieldDefinitions().get(0).name == "_empty"
+        servlet.getConfiguration().getInvocationInputFactory().getSchemaProvider().getReadOnlySchema().getQueryType().getFieldDefinitions().get(0).name == "_empty"
     }
 
     static class TestMutationProvider implements GraphQLMutationProvider {
@@ -110,7 +116,7 @@ class OsgiGraphQLHttpServletSpec extends Specification {
         @GraphQLName("subscription")
         static class Subscription {
             @GraphQLField
-            public String field;
+            public String field
         }
     }
 
@@ -127,7 +133,7 @@ class OsgiGraphQLHttpServletSpec extends Specification {
         subscription.getType().getName() == "subscription"
 
         when:
-        subscription = servlet.getConfiguration().getInvocationInputFactory().getSchemaProvider().getReadOnlySchema(null).getSubscriptionType().getFieldDefinition("subscription")
+        subscription = servlet.getConfiguration().getInvocationInputFactory().getSchemaProvider().getReadOnlySchema().getSubscriptionType().getFieldDefinition("subscription")
         then:
         subscription.getType().getName() == "subscription"
 
@@ -151,7 +157,7 @@ class OsgiGraphQLHttpServletSpec extends Specification {
     static class TestCodeRegistryProvider implements GraphQLCodeRegistryProvider {
         @Override
         GraphQLCodeRegistry getCodeRegistry() {
-            return GraphQLCodeRegistry.newCodeRegistry().typeResolver("Type", { env -> null }).build();
+            return GraphQLCodeRegistry.newCodeRegistry().typeResolver("Type", { env -> null }).build()
         }
     }
 
@@ -341,4 +347,27 @@ class OsgiGraphQLHttpServletSpec extends Specification {
         then:
         0 * executionStrategy.getQueryExecutionStrategy()
     }
+
+    def "instrumentation provider is bound and unbound"() {
+        setup:
+        def servlet = new OsgiGraphQLHttpServlet()
+        def instrumentation = new SimpleInstrumentation()
+        def instrumentationProvider = Mock(InstrumentationProvider)
+        instrumentationProvider.getInstrumentation() >> instrumentation
+        def request = GraphQLRequest.createIntrospectionRequest()
+        instrumentation.createState(_ as InstrumentationCreateStateParameters) >> Mock(InstrumentationState)
+
+        when:
+        servlet.setInstrumentationProvider(instrumentationProvider)
+        def invocationInput = servlet.configuration.invocationInputFactory.create(request)
+        servlet.configuration.graphQLInvoker.query(invocationInput)
+
+        then:
+        noExceptionThrown()
+
+        when:
+        servlet.unsetInstrumentationProvider(instrumentationProvider)
+        then:
+        noExceptionThrown()
+    }
 }

graphql-java-servlet/src/test/groovy/graphql/kickstart/servlet/PartIOExceptionTest.groovy

@@ -0,0 +1,13 @@
+package graphql.kickstart.servlet
+
+import spock.lang.Specification
+
+class PartIOExceptionTest extends Specification {
+
+    def "constructs"() {
+        when:
+        def e = new PartIOException("some message", new IOException())
+        then:
+        e instanceof RuntimeException
+    }
+}

graphql-java-servlet/src/test/groovy/graphql/kickstart/servlet/SingleAsynchronousQueryResponseWriterTest.groovy

@@ -0,0 +1,34 @@
+package graphql.kickstart.servlet
+
+import graphql.ExecutionResult
+import graphql.kickstart.execution.GraphQLObjectMapper
+import org.springframework.mock.web.MockAsyncContext
+import spock.lang.Specification
+
+import javax.servlet.http.HttpServletRequest
+import javax.servlet.http.HttpServletResponse
+
+class SingleAsynchronousQueryResponseWriterTest extends Specification {
+
+    def "result data is no publisher should"() {
+        given:
+        def result = Mock(ExecutionResult)
+        def objectMapper = Mock(GraphQLObjectMapper)
+        def writer = new SingleAsynchronousQueryResponseWriter(result, objectMapper, 100)
+        def request = Mock(HttpServletRequest)
+        def responseWriter = new PrintWriter(new StringWriter())
+        def response = Mock(HttpServletResponse)
+        response.getWriter() >> responseWriter
+        def asyncContext = new MockAsyncContext(request, response)
+        request.getAsyncContext() >> asyncContext
+        request.isAsyncStarted() >> true
+        objectMapper.serializeResultAsJson(result) >> "{ }"
+
+        when:
+        writer.write(request, response)
+
+        then:
+        noExceptionThrown()
+    }
+
+}

lombok.config

@@ -0,0 +1 @@
+lombok.addLombokGeneratedAnnotation = true