Added ability to cache the whole graphql response

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

@@ -7,6 +7,7 @@
 import graphql.kickstart.execution.GraphQLQueryInvoker;
 import graphql.kickstart.execution.GraphQLRequest;
 import graphql.kickstart.execution.input.GraphQLSingleInvocationInput;
+import graphql.kickstart.servlet.cache.CachingHttpRequestHandlerImpl;
 import graphql.schema.GraphQLFieldDefinition;
 import graphql.kickstart.servlet.core.GraphQLMBean;
 import graphql.kickstart.servlet.core.GraphQLServletListener;
@@ -83,7 +84,11 @@ protected GraphQLConfiguration getConfiguration() {
   public void init() {
     if (configuration == null) {
       this.configuration = getConfiguration();
-      this.requestHandler = new HttpRequestHandlerImpl(configuration);
+      if (configuration.getResponseCacheManager() != null) {
+        this.requestHandler = new CachingHttpRequestHandlerImpl(configuration);
+      } else {
+        this.requestHandler = new HttpRequestHandlerImpl(configuration);
+      }
     }
   }
 

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

@@ -2,14 +2,17 @@
 
 import graphql.ExecutionResult;
 import graphql.kickstart.execution.GraphQLObjectMapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.Iterator;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import lombok.RequiredArgsConstructor;
 
+@Slf4j
 @RequiredArgsConstructor
 class BatchedQueryResponseWriter implements QueryResponseWriter {
 
@@ -34,6 +37,7 @@ public void write(HttpServletRequest request, HttpServletResponse response) thro
 
     String responseContent = responseBuilder.toString();
     byte[] contentBytes = responseContent.getBytes(StandardCharsets.UTF_8);
+
     response.setContentLength(contentBytes.length);
     response.getOutputStream().write(contentBytes);
   }

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

@@ -4,6 +4,7 @@
 import graphql.kickstart.execution.GraphQLObjectMapper;
 import graphql.kickstart.execution.GraphQLQueryInvoker;
 import graphql.kickstart.execution.context.ContextSetting;
+import graphql.kickstart.servlet.cache.GraphQLResponseCacheManager;
 import graphql.kickstart.servlet.config.DefaultGraphQLSchemaServletProvider;
 import graphql.kickstart.servlet.config.GraphQLSchemaServletProvider;
 import graphql.kickstart.servlet.context.GraphQLServletContextBuilder;
@@ -36,12 +37,13 @@ public class GraphQLConfiguration {
   @Getter
   private final long asyncTimeout;
   private final ContextSetting contextSetting;
+  private final GraphQLResponseCacheManager responseCacheManager;
 
   private GraphQLConfiguration(GraphQLInvocationInputFactory invocationInputFactory,
       GraphQLQueryInvoker queryInvoker,
       GraphQLObjectMapper objectMapper, List<GraphQLServletListener> listeners, boolean asyncServletModeEnabled,
       Executor asyncExecutor, long subscriptionTimeout, long asyncTimeout, ContextSetting contextSetting,
-      Supplier<BatchInputPreProcessor> batchInputPreProcessor) {
+      Supplier<BatchInputPreProcessor> batchInputPreProcessor, GraphQLResponseCacheManager responseCacheManager) {
     this.invocationInputFactory = invocationInputFactory;
     this.queryInvoker = queryInvoker;
     this.graphQLInvoker = queryInvoker.toGraphQLInvoker();
@@ -53,6 +55,7 @@ private GraphQLConfiguration(GraphQLInvocationInputFactory invocationInputFactor
     this.asyncTimeout = asyncTimeout;
     this.contextSetting = contextSetting;
     this.batchInputPreProcessor = batchInputPreProcessor;
+    this.responseCacheManager = responseCacheManager;
   }
 
   public static GraphQLConfiguration.Builder with(GraphQLSchema schema) {
@@ -113,6 +116,10 @@ public BatchInputPreProcessor getBatchInputPreProcessor() {
     return batchInputPreProcessor.get();
   }
 
+  public GraphQLResponseCacheManager getResponseCacheManager() {
+    return responseCacheManager;
+  }
+
   public static class Builder {
 
     private GraphQLInvocationInputFactory.Builder invocationInputFactoryBuilder;
@@ -126,6 +133,7 @@ public static class Builder {
     private long asyncTimeout = 30;
     private ContextSetting contextSetting = ContextSetting.PER_QUERY_WITH_INSTRUMENTATION;
     private Supplier<BatchInputPreProcessor> batchInputPreProcessorSupplier = NoOpBatchInputPreProcessor::new;
+    private GraphQLResponseCacheManager responseCacheManager;
 
     private Builder(GraphQLInvocationInputFactory.Builder invocationInputFactoryBuilder) {
       this.invocationInputFactoryBuilder = invocationInputFactoryBuilder;
@@ -209,6 +217,11 @@ public Builder with(Supplier<BatchInputPreProcessor> batchInputPreProcessor) {
       return this;
     }
 
+    public Builder with(GraphQLResponseCacheManager responseCache) {
+      this.responseCacheManager = responseCache;
+      return this;
+    }
+
     public GraphQLConfiguration build() {
       return new GraphQLConfiguration(
           this.invocationInputFactory != null ? this.invocationInputFactory : invocationInputFactoryBuilder.build(),
@@ -220,7 +233,8 @@ public GraphQLConfiguration build() {
           subscriptionTimeout,
           asyncTimeout,
           contextSetting,
-          batchInputPreProcessorSupplier
+          batchInputPreProcessorSupplier,
+          responseCacheManager
       );
     }
 

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

@@ -3,7 +3,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-interface HttpRequestHandler {
+public interface HttpRequestHandler {
 
   String APPLICATION_JSON_UTF8 = "application/json;charset=UTF-8";
   String APPLICATION_EVENT_STREAM_UTF8 = "text/event-stream;charset=UTF-8";

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

@@ -14,12 +14,12 @@
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
-class HttpRequestHandlerImpl implements HttpRequestHandler {
+public class HttpRequestHandlerImpl implements HttpRequestHandler {
 
   private final GraphQLConfiguration configuration;
   private final GraphQLInvoker graphQLInvoker;
 
-  HttpRequestHandlerImpl(GraphQLConfiguration configuration) {
+  public HttpRequestHandlerImpl(GraphQLConfiguration configuration) {
     this.configuration = configuration;
     graphQLInvoker = configuration.getGraphQLInvoker();
   }
@@ -46,13 +46,12 @@ public void handle(HttpServletRequest request, HttpServletResponse response) thr
     }
   }
 
-  private void execute(GraphQLInvocationInput invocationInput, HttpServletRequest request,
+  protected void execute(GraphQLInvocationInput invocationInput, HttpServletRequest request,
       HttpServletResponse response) {
     try {
       GraphQLQueryResult queryResult = invoke(invocationInput, request, response);
 
-      QueryResponseWriter queryResponseWriter = QueryResponseWriter.createWriter(queryResult, configuration.getObjectMapper(),
-          configuration.getSubscriptionTimeout());
+      QueryResponseWriter queryResponseWriter = createWriter(invocationInput, queryResult);
       queryResponseWriter.write(request, response);
     } catch (Throwable t) {
       response.setStatus(STATUS_BAD_REQUEST);
@@ -61,6 +60,11 @@ private void execute(GraphQLInvocationInput invocationInput, HttpServletRequest
     }
   }
 
+  protected QueryResponseWriter createWriter(GraphQLInvocationInput invocationInput, GraphQLQueryResult queryResult) {
+    return QueryResponseWriter.createWriter(queryResult, configuration.getObjectMapper(),
+            configuration.getSubscriptionTimeout());
+  }
+
   private GraphQLQueryResult invoke(GraphQLInvocationInput invocationInput, HttpServletRequest request,
       HttpServletResponse response) {
     if (invocationInput instanceof GraphQLSingleInvocationInput) {

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

@@ -1,13 +1,14 @@
 package graphql.kickstart.servlet;
 
-import graphql.kickstart.execution.GraphQLQueryResult;
 import graphql.kickstart.execution.GraphQLObjectMapper;
-import java.io.IOException;
-import java.util.Objects;
+import graphql.kickstart.execution.GraphQLQueryResult;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Objects;
 
-interface QueryResponseWriter {
+public interface QueryResponseWriter {
 
   static QueryResponseWriter createWriter(
       GraphQLQueryResult result,

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

@@ -4,10 +4,10 @@
 import graphql.kickstart.execution.GraphQLObjectMapper;
 import lombok.RequiredArgsConstructor;
 
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 
 @RequiredArgsConstructor
 class SingleQueryResponseWriter implements QueryResponseWriter {

graphql-java-servlet/src/main/java/graphql/kickstart/servlet/cache/BufferedHttpServletResponse.java

@@ -0,0 +1,142 @@
+package graphql.kickstart.servlet.cache;
+
+import lombok.extern.slf4j.Slf4j;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.WriteListener;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponseWrapper;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+
+@Slf4j
+public class BufferedHttpServletResponse extends HttpServletResponseWrapper {
+
+  private static final class BufferedOutputStream extends ServletOutputStream {
+
+    private final OutputStream delegate;
+    private final ByteArrayOutputStream buf = new ByteArrayOutputStream();
+
+    public BufferedOutputStream(OutputStream delegate) {
+      this.delegate = delegate;
+    }
+
+    public void write(int b) throws IOException {
+      buf.write(b);
+      delegate.write(b);
+    }
+
+    @Override
+    public void flush() throws IOException {
+      buf.flush();
+      delegate.flush();
+    }
+
+    @Override
+    public void close() throws IOException {
+      buf.close();
+      delegate.close();
+    }
+
+    @Override
+    public boolean isReady() {
+      return true;
+    }
+
+    @Override
+    public void setWriteListener(WriteListener writeListener) {
+    }
+
+    public byte[] toByteArray() {
+      return buf.toByteArray();
+    }
+
+  }
+
+  private BufferedOutputStream copier;
+
+  private ServletOutputStream outputStream;
+  private PrintWriter writer;
+  private String errorMessage;
+
+  public BufferedHttpServletResponse(HttpServletResponse response) {
+    super(response);
+  }
+
+  @Override
+  public void sendError(int sc, String msg) throws IOException {
+    errorMessage = msg;
+    super.sendError(sc, msg);
+  }
+
+  @Override
+  public void sendError(int sc) throws IOException {
+    sendError(sc, null);
+  }
+
+  @Override
+  public ServletOutputStream getOutputStream() throws IOException {
+    if (writer != null) {
+      throw new IllegalStateException("getWriter() has already been called on this response.");
+    }
+
+    if (outputStream == null) {
+      outputStream = getResponse().getOutputStream();
+      copier = new BufferedOutputStream(outputStream);
+    }
+
+    return copier;
+  }
+
+  @Override
+  public PrintWriter getWriter() throws IOException {
+    if (outputStream != null) {
+      throw new IllegalStateException("getOutputStream() has already been called on this response.");
+    }
+
+    if (writer == null) {
+      copier = new BufferedOutputStream(getResponse().getOutputStream());
+      writer = new PrintWriter(new OutputStreamWriter(copier, getResponse().getCharacterEncoding()), true);
+    }
+
+    return writer;
+  }
+
+  @Override
+  public void flushBuffer() throws IOException {
+    if (writer != null) {
+      writer.flush();
+    } else if (copier != null) {
+      copier.flush();
+    }
+  }
+
+  @Override
+  public boolean isCommitted() {
+    return false;
+  }
+
+  public void close() throws IOException {
+    if (writer != null) {
+      writer.close();
+    } else if (copier != null) {
+      copier.close();
+    }
+  }
+
+  public String getErrorMessage() {
+    return errorMessage;
+  }
+
+  public byte[] getContentAsByteArray() {
+    if (copier != null) {
+      return copier.toByteArray();
+    } else {
+      return new byte[0];
+    }
+  }
+
+}