Moved createCacheWriter from QueryResponseWriter to CachingQueryResponseWriter.

Author: donbeave

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

@@ -2,9 +2,6 @@
 
 import graphql.kickstart.execution.GraphQLObjectMapper;
 import graphql.kickstart.execution.GraphQLQueryResult;
-import graphql.kickstart.execution.input.GraphQLInvocationInput;
-import graphql.kickstart.servlet.cache.CachingQueryResponseWriter;
-import graphql.kickstart.servlet.cache.GraphQLResponseCacheManager;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -30,20 +27,6 @@ static QueryResponseWriter createWriter(
     return new SingleQueryResponseWriter(result.getResult(), graphQLObjectMapper);
   }
 
-  static QueryResponseWriter createCacheWriter(
-      GraphQLQueryResult result,
-      GraphQLObjectMapper graphQLObjectMapper,
-      long subscriptionTimeout,
-      GraphQLInvocationInput invocationInput,
-      GraphQLResponseCacheManager responseCache
-  ) {
-    QueryResponseWriter writer = createWriter(result, graphQLObjectMapper, subscriptionTimeout);
-    if (responseCache != null) {
-      return new CachingQueryResponseWriter(writer, responseCache, invocationInput, result.isError());
-    }
-    return writer;
-  }
-
   void write(HttpServletRequest request, HttpServletResponse response) throws IOException;
 
 }

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

@@ -44,7 +44,7 @@ protected void execute(GraphQLInvocationInput invocationInput, HttpServletReques
   }
 
   protected QueryResponseWriter createWriter(GraphQLInvocationInput invocationInput, GraphQLQueryResult queryResult) {
-    return QueryResponseWriter.createCacheWriter(
+    return CachingQueryResponseWriter.createCacheWriter(
         queryResult,
         configuration.getObjectMapper(),
         configuration.getSubscriptionTimeout(),

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

@@ -1,5 +1,7 @@
 package graphql.kickstart.servlet.cache;
 
+import graphql.kickstart.execution.GraphQLObjectMapper;
+import graphql.kickstart.execution.GraphQLQueryResult;
 import graphql.kickstart.execution.input.GraphQLInvocationInput;
 import graphql.kickstart.servlet.QueryResponseWriter;
 import lombok.extern.slf4j.Slf4j;
@@ -11,6 +13,20 @@
 @Slf4j
 public class CachingQueryResponseWriter implements QueryResponseWriter {
 
+  static QueryResponseWriter createCacheWriter(
+          GraphQLQueryResult result,
+          GraphQLObjectMapper graphQLObjectMapper,
+          long subscriptionTimeout,
+          GraphQLInvocationInput invocationInput,
+          GraphQLResponseCacheManager responseCache
+  ) {
+    QueryResponseWriter writer = QueryResponseWriter.createWriter(result, graphQLObjectMapper, subscriptionTimeout);
+    if (responseCache != null) {
+      return new CachingQueryResponseWriter(writer, responseCache, invocationInput, result.isError());
+    }
+    return writer;
+  }
+
   private final QueryResponseWriter delegate;
   private final GraphQLResponseCacheManager responseCache;
   private final GraphQLInvocationInput invocationInput;