Fix sonar issues

Author: oliemansm

graphql-java-servlet/src/main/java/graphql/kickstart/servlet/AbstractGraphQLHttpServlet.java

@@ -3,15 +3,11 @@
 import static graphql.kickstart.execution.GraphQLRequest.createQueryOnlyRequest;
 
 import graphql.ExecutionResult;
-import graphql.kickstart.execution.GraphQLObjectMapper;
-import graphql.kickstart.execution.GraphQLQueryInvoker;
 import graphql.kickstart.execution.GraphQLRequest;
 import graphql.kickstart.execution.input.GraphQLSingleInvocationInput;
 import graphql.kickstart.servlet.core.GraphQLMBean;
 import graphql.kickstart.servlet.core.GraphQLServletListener;
-import graphql.kickstart.servlet.input.GraphQLInvocationInputFactory;
 import graphql.schema.GraphQLFieldDefinition;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.function.Consumer;
@@ -30,81 +26,26 @@
 public abstract class AbstractGraphQLHttpServlet extends HttpServlet implements Servlet,
     GraphQLMBean {
 
-  /**
-   * @deprecated use {@link #getConfiguration()} instead
-   */
-  @Deprecated
-  private final List<GraphQLServletListener> listeners;
-  private GraphQLConfiguration configuration;
-  private HttpRequestHandler requestHandler;
-
-  public AbstractGraphQLHttpServlet() {
-    this(null);
-  }
-
-  public AbstractGraphQLHttpServlet(List<GraphQLServletListener> listeners) {
-    this.listeners = listeners != null ? new ArrayList<>(listeners) : new ArrayList<>();
-  }
-
-  /**
-   * @deprecated override {@link #getConfiguration()} instead
-   */
-  @Deprecated
-  protected abstract GraphQLQueryInvoker getQueryInvoker();
-
-  /**
-   * @deprecated override {@link #getConfiguration()} instead
-   */
-  @Deprecated
-  protected abstract GraphQLInvocationInputFactory getInvocationInputFactory();
-
-  /**
-   * @deprecated override {@link #getConfiguration()} instead
-   */
-  @Deprecated
-  protected abstract GraphQLObjectMapper getGraphQLObjectMapper();
-
-  protected GraphQLConfiguration getConfiguration() {
-    return GraphQLConfiguration.with(getInvocationInputFactory())
-        .with(getQueryInvoker())
-        .with(getGraphQLObjectMapper())
-        .with(listeners)
-        .build();
-  }
-
-  @Override
-  public void init() {
-    if (configuration == null) {
-      this.configuration = getConfiguration();
-      this.requestHandler = configuration.createHttpRequestHandler();
-    }
-  }
+  protected abstract GraphQLConfiguration getConfiguration();
 
   public void addListener(GraphQLServletListener servletListener) {
-    if (configuration != null) {
-      configuration.add(servletListener);
-    } else {
-      listeners.add(servletListener);
-    }
+    getConfiguration().add(servletListener);
   }
 
   public void removeListener(GraphQLServletListener servletListener) {
-    if (configuration != null) {
-      configuration.remove(servletListener);
-    } else {
-      listeners.remove(servletListener);
-    }
+    getConfiguration().remove(servletListener);
   }
 
   @Override
   public String[] getQueries() {
-    return configuration.getInvocationInputFactory().getSchemaProvider().getSchema().getQueryType()
+    return getConfiguration().getInvocationInputFactory().getSchemaProvider().getSchema()
+        .getQueryType()
         .getFieldDefinitions().stream().map(GraphQLFieldDefinition::getName).toArray(String[]::new);
   }
 
   @Override
   public String[] getMutations() {
-    return configuration.getInvocationInputFactory().getSchemaProvider().getSchema()
+    return getConfiguration().getInvocationInputFactory().getSchemaProvider().getSchema()
         .getMutationType()
         .getFieldDefinitions().stream().map(GraphQLFieldDefinition::getName).toArray(String[]::new);
   }
@@ -113,10 +54,11 @@ public String[] getMutations() {
   public String executeQuery(String query) {
     try {
       GraphQLRequest graphQLRequest = createQueryOnlyRequest(query);
-      GraphQLSingleInvocationInput invocationInput = configuration.getInvocationInputFactory()
+      GraphQLSingleInvocationInput invocationInput = getConfiguration().getInvocationInputFactory()
           .create(graphQLRequest);
-      ExecutionResult result = configuration.getGraphQLInvoker().query(invocationInput).getResult();
-      return configuration.getObjectMapper().serializeResultAsJson(result);
+      ExecutionResult result = getConfiguration().getGraphQLInvoker().query(invocationInput)
+          .getResult();
+      return getConfiguration().getObjectMapper().serializeResultAsJson(result);
     } catch (Exception e) {
       return e.getMessage();
     }
@@ -133,12 +75,11 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) {
   }
 
   private void doRequest(HttpServletRequest request, HttpServletResponse response) {
-    init();
     List<GraphQLServletListener.RequestCallback> requestCallbacks = runListeners(
         l -> l.onRequest(request, response));
 
     try {
-      requestHandler.handle(request, response);
+      getConfiguration().getHttpRequestHandler().handle(request, response);
       runCallbacks(requestCallbacks, c -> c.onSuccess(request, response));
     } catch (Exception t) {
       log.error("Error executing GraphQL request!", t);
@@ -149,7 +90,7 @@ private void doRequest(HttpServletRequest request, HttpServletResponse response)
   }
 
   private <R> List<R> runListeners(Function<? super GraphQLServletListener, R> action) {
-    return configuration.getListeners().stream()
+    return getConfiguration().getListeners().stream()
         .map(listener -> {
           try {
             return action.apply(listener);

graphql-java-servlet/src/main/java/graphql/kickstart/servlet/ConfiguredGraphQLHttpServlet.java

@@ -4,7 +4,7 @@
 
 class ConfiguredGraphQLHttpServlet extends GraphQLHttpServlet {
 
-  private GraphQLConfiguration configuration;
+  private final GraphQLConfiguration configuration;
 
   ConfiguredGraphQLHttpServlet(GraphQLConfiguration configuration) {
     this.configuration = Objects.requireNonNull(configuration, "configuration is required");

graphql-java-servlet/src/main/java/graphql/kickstart/servlet/DefaultGraphQLServlet.java

@@ -41,6 +41,7 @@ public void onNext(ExecutionResult executionResult) {
       writer.flush();
       subscriptionRef.get().request(1);
     } catch (IOException ignored) {
+      // ignore
     }
   }
 

graphql-java-servlet/src/main/java/graphql/kickstart/servlet/ExecutionResultSubscriber.java

@@ -33,6 +33,7 @@ public class GraphQLConfiguration {
   private final long asyncTimeout;
   private final ContextSetting contextSetting;
   private final GraphQLResponseCacheManager responseCacheManager;
+  private HttpRequestHandler requestHandler;
 
   private GraphQLConfiguration(GraphQLInvocationInputFactory invocationInputFactory,
       GraphQLQueryInvoker queryInvoker,
@@ -110,12 +111,15 @@ public GraphQLResponseCacheManager getResponseCacheManager() {
     return responseCacheManager;
   }
 
-  public HttpRequestHandler createHttpRequestHandler() {
-    HttpRequestHandler requestHandler = HttpRequestHandlerFactory.create(this);
-    if (responseCacheManager == null) {
-      return requestHandler;
+  public HttpRequestHandler getHttpRequestHandler() {
+    if (requestHandler == null) {
+      if (responseCacheManager == null) {
+        requestHandler = new HttpRequestHandlerImpl(this);
+      } else {
+        requestHandler = new HttpRequestHandlerImpl(this, new CachingHttpRequestInvoker(this));
+      }
     }
-    return new HttpRequestHandlerImpl(this, new CachingHttpRequestInvoker(this));
+    return requestHandler;
   }
 
   public static class Builder {

graphql-java-servlet/src/main/java/graphql/kickstart/servlet/GraphQLConfiguration.java

@@ -1,8 +1,5 @@
 package graphql.kickstart.servlet;
 
-import graphql.kickstart.execution.GraphQLObjectMapper;
-import graphql.kickstart.execution.GraphQLQueryInvoker;
-import graphql.kickstart.servlet.input.GraphQLInvocationInputFactory;
 import graphql.schema.GraphQLSchema;
 
 /**
@@ -21,19 +18,4 @@ public static GraphQLHttpServlet with(GraphQLConfiguration configuration) {
   @Override
   protected abstract GraphQLConfiguration getConfiguration();
 
-  @Override
-  protected GraphQLQueryInvoker getQueryInvoker() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  protected GraphQLInvocationInputFactory getInvocationInputFactory() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  protected GraphQLObjectMapper getGraphQLObjectMapper() {
-    throw new UnsupportedOperationException();
-  }
-
 }

graphql-java-servlet/src/main/java/graphql/kickstart/servlet/GraphQLHttpServlet.java

@@ -77,7 +77,7 @@ public GraphQLWebsocketServlet(GraphQLConfiguration configuration,
         configuration.getGraphQLInvoker(),
         configuration.getInvocationInputFactory(),
         configuration.getObjectMapper(),
-        null
+        connectionListeners
     );
   }
 
@@ -124,7 +124,6 @@ public void onOpen(Session session, EndpointConfig endpointConfig) {
         (WebSocketSubscriptionProtocolFactory) endpointConfig.getUserProperties()
             .get(PROTOCOL_FACTORY_REQUEST_KEY);
 
-    // todo: create apollo version of it through SubscriptionProtocolFactory
     SubscriptionSession subscriptionSession = subscriptionProtocolFactory.createSession(session);
     synchronized (cacheLock) {
       if (isShuttingDown.get()) {
@@ -145,7 +144,7 @@ public void onOpen(Session session, EndpointConfig endpointConfig) {
       public void onMessage(String text) {
         try {
           consumer.accept(text);
-        } catch (Throwable t) {
+        } catch (Exception t) {
           log.error("Error executing websocket query for session: {}", session.getId(), t);
           closeUnexpectedly(session, t);
         }

graphql-java-servlet/src/main/java/graphql/kickstart/servlet/GraphQLWebsocketServlet.java

@@ -1,5 +1,6 @@
 package graphql.kickstart.servlet;
 
+import java.io.IOException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -12,6 +13,6 @@ public interface HttpRequestHandler {
   int STATUS_BAD_REQUEST = 400;
   int STATUS_INTERNAL_SERVER_ERROR = 500;
 
-  void handle(HttpServletRequest request, HttpServletResponse response) throws Exception;
+  void handle(HttpServletRequest request, HttpServletResponse response) throws IOException;
 
 }

graphql-java-servlet/src/main/java/graphql/kickstart/servlet/HttpRequestHandler.java

@@ -113,18 +113,12 @@ public void deactivate() {
   }
 
   @Override
-  protected GraphQLQueryInvoker getQueryInvoker() {
-    return queryInvoker;
-  }
-
-  @Override
-  protected GraphQLInvocationInputFactory getInvocationInputFactory() {
-    return invocationInputFactory;
-  }
-
-  @Override
-  protected GraphQLObjectMapper getGraphQLObjectMapper() {
-    return graphQLObjectMapper;
+  protected GraphQLConfiguration getConfiguration() {
+    return GraphQLConfiguration
+        .with(invocationInputFactory)
+        .with(queryInvoker)
+        .with(graphQLObjectMapper)
+        .build();
   }
 
   protected void updateSchema() {