remove redundant variable, reuse original request for retry

apollographql · Jun 24, 2019 · b35c6b4 · b35c6b4
1 parent 658c620
commit b35c6b4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 15 deletions.
diff --git a/...va/com/apollographql/apollo/internal/interceptor/ApolloAutoPersistedQueryInterceptor.java b/...va/com/apollographql/apollo/internal/interceptor/ApolloAutoPersistedQueryInterceptor.java
@@ -20,7 +20,6 @@ public class ApolloAutoPersistedQueryInterceptor implements ApolloInterceptor {
 
   private final ApolloLogger logger;
   private volatile boolean disposed;
-  private boolean useHttpGetMethodForQueries;
 
   final boolean useHttpGetMethodForPersistedQueries;
 
@@ -34,12 +33,10 @@ public ApolloAutoPersistedQueryInterceptor(@NotNull ApolloLogger logger,
   public void interceptAsync(@NotNull final InterceptorRequest request, @NotNull final ApolloInterceptorChain chain,
       @NotNull final Executor dispatcher, @NotNull final CallBack callBack) {
 
-    useHttpGetMethodForQueries = request.useHttpGetMethodForQueries;
-
     InterceptorRequest newRequest = request.toBuilder()
             .sendQueryDocument(false)
             .autoPersistQueries(true)
-            .useHttpGetMethodForQueries(useHttpGetMethodForQueries || useHttpGetMethodForPersistedQueries)
+            .useHttpGetMethodForQueries(request.useHttpGetMethodForQueries || useHttpGetMethodForPersistedQueries)
             .build();
     chain.proceedAsync(newRequest, dispatcher, new CallBack() {
       @Override public void onResponse(@NotNull InterceptorResponse response) {
@@ -81,21 +78,13 @@ Optional<InterceptorRequest> handleProtocolNegotiation(final InterceptorRequest
             logger.w("GraphQL server couldn't find Automatic Persisted Query for operation name: "
                 + request.operation.name().name() + " id: " + request.operation.operationId());
 
-            return Optional.of(request.toBuilder()
-                    .sendQueryDocument(true)
-                    .autoPersistQueries(true)
-                    .useHttpGetMethodForQueries(useHttpGetMethodForQueries)
-                    .build());
+            return Optional.of(request);
           }
 
           if (isPersistedQueryNotSupported(response.errors())) {
             // TODO how to disable Automatic Persisted Queries in future and how to notify user about this
             logger.e("GraphQL server doesn't support Automatic Persisted Queries");
-            return Optional.of(request.toBuilder()
-                    .sendQueryDocument(true)
-                    .autoPersistQueries(true)
-                    .useHttpGetMethodForQueries(useHttpGetMethodForQueries)
-                    .build());
+            return Optional.of(request);
           }
         }
         return Optional.absent();

diff --git a/...om/apollographql/apollo/internal/interceptor/ApolloAutoPersistedQueryInterceptorTest.java b/...om/apollographql/apollo/internal/interceptor/ApolloAutoPersistedQueryInterceptorTest.java
@@ -46,7 +46,8 @@ public class ApolloAutoPersistedQueryInterceptorTest {
           new ApolloAutoPersistedQueryInterceptor(new ApolloLogger(Optional.<Logger>absent()), true);
 
   private ApolloInterceptor.InterceptorRequest request = ApolloInterceptor.InterceptorRequest.builder(new MockOperation())
-      .build();
+          .autoPersistQueries(true)
+          .build();
 
   @Test
   public void initialRequestWithoutQueryDocument() {
@@ -60,6 +61,8 @@ public void initialRequestWithoutQueryDocument() {
         any(ApolloInterceptor.CallBack.class));
 
     assertThat(requestArgumentCaptor.getValue().sendQueryDocument).isFalse();
+    assertThat(requestArgumentCaptor.getValue().useHttpGetMethodForQueries).isFalse();
+    assertThat(requestArgumentCaptor.getValue().autoPersistQueries).isTrue();
   }
 
   @Test
@@ -73,7 +76,9 @@ public void initialRequestWithGetMethodForPersistedQueries() {
     verify(chain).proceedAsync(requestArgumentCaptor.capture(), any(Executor.class),
             any(ApolloInterceptor.CallBack.class));
 
+    assertThat(requestArgumentCaptor.getValue().sendQueryDocument).isFalse();
     assertThat(requestArgumentCaptor.getValue().useHttpGetMethodForQueries).isTrue();
+    assertThat(requestArgumentCaptor.getValue().autoPersistQueries).isTrue();
   }
 
   @Test
@@ -85,6 +90,7 @@ public void proceedAsync(@NotNull ApolloInterceptor.InterceptorRequest request,
         super.proceedAsync(request, dispatcher, callBack);
         if (proceedAsyncInvocationCount == 1) {
           assertThat(request.sendQueryDocument).isFalse();
+          assertThat(request.autoPersistQueries).isTrue();
           callBack.onResponse(
               new ApolloInterceptor.InterceptorResponse(
                   mockHttpResponse(),
@@ -96,6 +102,7 @@ public void proceedAsync(@NotNull ApolloInterceptor.InterceptorRequest request,
           );
         } else if (proceedAsyncInvocationCount == 2) {
           assertThat(request.sendQueryDocument).isTrue();
+          assertThat(request.autoPersistQueries).isTrue();
           callBack.onResponse(
               new ApolloInterceptor.InterceptorResponse(
                   mockHttpResponse(),
@@ -132,6 +139,7 @@ public void proceedAsync(@NotNull ApolloInterceptor.InterceptorRequest request,
         super.proceedAsync(request, dispatcher, callBack);
         if (proceedAsyncInvocationCount == 1) {
           assertThat(request.sendQueryDocument).isFalse();
+          assertThat(request.autoPersistQueries).isTrue();
           callBack.onResponse(
               new ApolloInterceptor.InterceptorResponse(
                   mockHttpResponse(),
@@ -143,6 +151,7 @@ public void proceedAsync(@NotNull ApolloInterceptor.InterceptorRequest request,
           );
         } else if (proceedAsyncInvocationCount == 2) {
           assertThat(request.sendQueryDocument).isTrue();
+          assertThat(request.autoPersistQueries).isTrue();
           callBack.onResponse(
               new ApolloInterceptor.InterceptorResponse(
                   mockHttpResponse(),