Refactor legacyResponse

apollographql · Aug 7, 2024 · 9940a43 · 9940a43
1 parent 5d4de74
commit 9940a43
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/apollo-ios/Sources/Apollo/HTTPResponse.swift b/apollo-ios/Sources/Apollo/HTTPResponse.swift
@@ -19,8 +19,9 @@ public class HTTPResponse<Operation: GraphQLOperation> {
   /// [optional] The data as parsed into a `GraphQLResponse` for legacy caching purposes. If you're not using the 
   /// `JSONResponseParsingInterceptor`, you probably shouldn't be using this property.
   @available(*, deprecated, message: "Do not use. This property will be removed in a future version.")
-  public var legacyResponse: GraphQLResponse<Operation.Data>? = nil
-
+  public var legacyResponse: GraphQLResponse<Operation.Data>? { _legacyResponse }
+  var _legacyResponse: GraphQLResponse<Operation.Data>? = nil
+
   /// A set of cache records from the response
   public var cacheRecords: RecordSet?
 
@@ -49,6 +50,7 @@ extension HTTPResponse: Equatable where Operation.Data: Equatable {
     lhs.httpResponse == rhs.httpResponse &&
     lhs.rawData == rhs.rawData &&
     lhs.parsedResponse == rhs.parsedResponse &&
+    lhs._legacyResponse == rhs._legacyResponse &&
     lhs.cacheRecords == rhs.cacheRecords
   }
 }
@@ -60,6 +62,7 @@ extension HTTPResponse: Hashable where Operation.Data: Hashable {
     hasher.combine(httpResponse)
     hasher.combine(rawData)
     hasher.combine(parsedResponse)
+    hasher.combine(_legacyResponse)
     hasher.combine(cacheRecords)
   }
 }
diff --git a/apollo-ios/Sources/Apollo/IncrementalJSONResponseParsingInterceptor.swift b/apollo-ios/Sources/Apollo/IncrementalJSONResponseParsingInterceptor.swift
@@ -101,14 +101,15 @@ public struct IncrementalJSONResponseParsingInterceptor: ApolloInterceptor {
           }
         }
 
+        createdResponse._legacyResponse = nil
+
         parsedResult = currentResult
         parsedCacheRecords = currentCacheRecords
 
       } else {
-        let graphQLResponse = GraphQLResponse(
-          operation: request.operation,
-          body: body
-        )
+        let graphQLResponse = GraphQLResponse(operation: request.operation, body: body)
+        createdResponse._legacyResponse = graphQLResponse
+
         let (result, cacheRecords) = try graphQLResponse.parseResult(withCachePolicy: request.cachePolicy)
 
         parsedResult = result

diff --git a/apollo-ios/Sources/Apollo/JSONResponseParsingInterceptor.swift b/apollo-ios/Sources/Apollo/JSONResponseParsingInterceptor.swift
@@ -57,8 +57,9 @@ public struct JSONResponseParsingInterceptor: ApolloInterceptor {
       }
 
       let graphQLResponse = GraphQLResponse(operation: request.operation, body: body)
+      createdResponse._legacyResponse = graphQLResponse
+
       let (result, cacheRecords) = try graphQLResponse.parseResult(withCachePolicy: request.cachePolicy)
-
       createdResponse.parsedResponse = result
       createdResponse.cacheRecords = cacheRecords