Rename Defer20220824 protocol to GraphQL17Alpha2 fpr consistency

Author: BoD

libraries/apollo-api/src/commonMain/kotlin/com/apollographql/apollo/api/BooleanExpression.kt

@@ -95,7 +95,7 @@ private fun shouldParseFragment(
     // Modern protocol: parse fragments that are _not_ pending
     !deferredFragmentIdentifiers.contains(identifier)
   } else {
-    // Legacy 20220824 protocol: parse fragments that have been merged
+    // Legacy GraphQL17Alpha2 protocol: parse fragments that have been merged
     deferredFragmentIdentifiers.contains(identifier)
   }
 }

…Defer20220824IncrementalResultsMerger.kt …aphQL17Alpha2IncrementalResultsMerger.ktlibraries/apollo-runtime/src/commonMain/kotlin/com/apollographql/apollo/internal/incremental/Defer20220824IncrementalResultsMerger.kt renamed to libraries/apollo-runtime/src/commonMain/kotlin/com/apollographql/apollo/internal/incremental/GraphQL17Alpha2IncrementalResultsMerger.kt libraries/apollo-runtime/src/commonMain/kotlin/com/apollographql/apollo/internal/incremental/Defer20220824IncrementalResultsMerger.kt renamed to libraries/apollo-runtime/src/commonMain/kotlin/com/apollographql/apollo/internal/incremental/GraphQL17Alpha2IncrementalResultsMerger.kt

@@ -5,10 +5,10 @@ import com.apollographql.apollo.api.IncrementalResultIdentifiers
 import okio.BufferedSource
 
 /**
- * Merger for the [com.apollographql.apollo.network.http.HttpNetworkTransport.IncrementalDeliveryProtocol.Defer20220824] protocol format.
+ * Merger for the [com.apollographql.apollo.network.http.HttpNetworkTransport.IncrementalDeliveryProtocol.GraphQL17Alpha2] protocol format.
  */
 @Suppress("UNCHECKED_CAST")
-internal class Defer20220824IncrementalResultsMerger : IncrementalResultsMerger {
+internal class GraphQL17Alpha2IncrementalResultsMerger : IncrementalResultsMerger {
   private val _merged: MutableJsonMap = mutableMapOf()
   override val merged: JsonMap = _merged
 

libraries/apollo-runtime/src/commonMain/kotlin/com/apollographql/apollo/internal/incremental/IncrementalDeliveryProtocolImpl.kt

@@ -18,7 +18,7 @@ internal sealed interface IncrementalDeliveryProtocolImpl {
   object Defer20220824 : IncrementalDeliveryProtocolImpl {
     override val acceptHeader: String = "multipart/mixed;deferSpec=20220824, application/graphql-response+json, application/json"
 
-    override fun newIncrementalResultsMerger(): IncrementalResultsMerger = Defer20220824IncrementalResultsMerger()
+    override fun newIncrementalResultsMerger(): IncrementalResultsMerger = GraphQL17Alpha2IncrementalResultsMerger()
   }
 
   /**
@@ -37,6 +37,6 @@ internal sealed interface IncrementalDeliveryProtocolImpl {
 
 internal val HttpNetworkTransport.IncrementalDeliveryProtocol.impl: IncrementalDeliveryProtocolImpl
   get() = when (this) {
-    HttpNetworkTransport.IncrementalDeliveryProtocol.Defer20220824 -> IncrementalDeliveryProtocolImpl.Defer20220824
+    HttpNetworkTransport.IncrementalDeliveryProtocol.GraphQL17Alpha2 -> IncrementalDeliveryProtocolImpl.Defer20220824
     HttpNetworkTransport.IncrementalDeliveryProtocol.GraphQL17Alpha9 -> IncrementalDeliveryProtocolImpl.GraphQL17Alpha9
   }

libraries/apollo-runtime/src/commonMain/kotlin/com/apollographql/apollo/network/http/HttpNetworkTransport.kt

@@ -314,7 +314,7 @@ private constructor(
     private var engine: HttpEngine? = null
     private val interceptors: MutableList<HttpInterceptor> = mutableListOf()
     private var exposeErrorBody: Boolean = false
-    private var incrementalDeliveryProtocol: IncrementalDeliveryProtocol = IncrementalDeliveryProtocol.Defer20220824
+    private var incrementalDeliveryProtocol: IncrementalDeliveryProtocol = IncrementalDeliveryProtocol.GraphQL17Alpha2
     private val headers: MutableList<HttpHeader> = mutableListOf()
 
     fun httpRequestComposer(httpRequestComposer: HttpRequestComposer) = apply {
@@ -361,7 +361,7 @@ private constructor(
     /**
      * The incremental delivery protocol to use when using `@defer` and/or `@stream`.
      *
-     * Default: [IncrementalDeliveryProtocol.Defer20220824]
+     * Default: [IncrementalDeliveryProtocol.GraphQL17Alpha2]
      */
     @ApolloExperimental
     fun incrementalDeliveryProtocol(incrementalDeliveryProtocol: IncrementalDeliveryProtocol) = apply {
@@ -420,14 +420,14 @@ private constructor(
   enum class IncrementalDeliveryProtocol {
 
     /**
-     * Format specified in this historical commit:
+     * Newer format as implemented by graphql.js version `17.0.0-alpha.2` and specified in this historical commit:
      * https://github.com/graphql/graphql-spec/tree/48cf7263a71a683fab03d45d309fd42d8d9a6659/spec
      *
      * Only `@defer` is supported with this format.
      *
      * This is the default.
      */
-    Defer20220824,
+    GraphQL17Alpha2,
 
     /**
      * Newer format as implemented by graphql.js version `17.0.0-alpha.9`.

…r20220824IncrementalResultsMergerTest.kt …L17Alpha2IncrementalResultsMergerTest.ktlibraries/apollo-runtime/src/commonTest/kotlin/test/defer/Defer20220824IncrementalResultsMergerTest.kt renamed to libraries/apollo-runtime/src/commonTest/kotlin/test/defer/GraphQL17Alpha2IncrementalResultsMergerTest.kt libraries/apollo-runtime/src/commonTest/kotlin/test/defer/Defer20220824IncrementalResultsMergerTest.kt renamed to libraries/apollo-runtime/src/commonTest/kotlin/test/defer/GraphQL17Alpha2IncrementalResultsMergerTest.kt

@@ -6,7 +6,7 @@ import com.apollographql.apollo.annotations.ApolloInternal
 import com.apollographql.apollo.api.DeferredFragmentIdentifier
 import com.apollographql.apollo.api.json.BufferedSourceJsonReader
 import com.apollographql.apollo.api.json.readAny
-import com.apollographql.apollo.internal.incremental.Defer20220824IncrementalResultsMerger
+import com.apollographql.apollo.internal.incremental.GraphQL17Alpha2IncrementalResultsMerger
 import okio.Buffer
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -18,10 +18,10 @@ private fun String.buffer() = Buffer().writeUtf8(this)
 @Suppress("UNCHECKED_CAST")
 private fun jsonToMap(json: String): Map<String, Any?> = BufferedSourceJsonReader(json.buffer()).readAny() as Map<String, Any?>
 
-class Defer20220824IncrementalResultsMergerTest {
+class GraphQL17Alpha2IncrementalResultsMergerTest {
   @Test
   fun mergeJsonSingleIncrementalItem() {
-    val incrementalResultsMerger = Defer20220824IncrementalResultsMerger()
+    val incrementalResultsMerger = GraphQL17Alpha2IncrementalResultsMerger()
 
     //language=JSON
     val payload1 = """
@@ -392,7 +392,7 @@ class Defer20220824IncrementalResultsMergerTest {
 
   @Test
   fun mergeJsonMultipleIncrementalItems() {
-    val incrementalResultsMerger = Defer20220824IncrementalResultsMerger()
+    val incrementalResultsMerger = GraphQL17Alpha2IncrementalResultsMerger()
 
     //language=JSON
     val payload1 = """
@@ -668,7 +668,7 @@ class Defer20220824IncrementalResultsMergerTest {
 
   @Test
   fun emptyPayloads() {
-    val incrementalResultsMerger = Defer20220824IncrementalResultsMerger()
+    val incrementalResultsMerger = GraphQL17Alpha2IncrementalResultsMerger()
 
     //language=JSON
     val payload1 = """

…test/Defer20220824NormalizedCacheTest.kt …ferGraphQL17Alpha2NormalizedCacheTest.kttests/defer/src/commonTest/kotlin/test/Defer20220824NormalizedCacheTest.kt renamed to tests/defer/src/commonTest/kotlin/test/DeferGraphQL17Alpha2NormalizedCacheTest.kt tests/defer/src/commonTest/kotlin/test/Defer20220824NormalizedCacheTest.kt renamed to tests/defer/src/commonTest/kotlin/test/DeferGraphQL17Alpha2NormalizedCacheTest.kt

@@ -45,7 +45,7 @@ import kotlin.test.assertFailsWith
 import kotlin.test.assertIs
 import kotlin.test.assertTrue
 
-class Defer20220824NormalizedCacheTest {
+class DeferGraphQL17Alpha2NormalizedCacheTest {
   private lateinit var mockServer: MockServer
   private lateinit var apolloClient: ApolloClient
   private lateinit var store: ApolloStore

…monTest/kotlin/test/Defer20220824Test.kt …/kotlin/test/DeferGraphQL17Alpha2Test.kttests/defer/src/commonTest/kotlin/test/Defer20220824Test.kt renamed to tests/defer/src/commonTest/kotlin/test/DeferGraphQL17Alpha2Test.kt tests/defer/src/commonTest/kotlin/test/Defer20220824Test.kt renamed to tests/defer/src/commonTest/kotlin/test/DeferGraphQL17Alpha2Test.kt

@@ -25,7 +25,7 @@ import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 
-class Defer20220824Test {
+class DeferGraphQL17Alpha2Test {
   private lateinit var mockServer: MockServer
   private lateinit var apolloClient: ApolloClient