Skip to content

Commit 7fb253a

Browse files
committed
Keep symbols public but deprecated
1 parent b323879 commit 7fb253a

File tree

3 files changed

+27
-8
lines changed

3 files changed

+27
-8
lines changed

libraries/apollo-api/api/apollo-api.api

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -946,6 +946,9 @@ public final class com/apollographql/apollo/api/http/DefaultHttpRequestComposer$
946946
public final fun buildPostBody (Lcom/apollographql/apollo/api/Operation;Lcom/apollographql/apollo/api/CustomScalarAdapters;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lcom/apollographql/apollo/api/http/HttpBody;
947947
public final fun buildPostBody (Lcom/apollographql/apollo/api/Operation;Lcom/apollographql/apollo/api/CustomScalarAdapters;ZZLjava/lang/String;)Lcom/apollographql/apollo/api/http/HttpBody;
948948
public final fun composePayload (Lcom/apollographql/apollo/api/ApolloRequest;)Ljava/util/Map;
949+
public final fun getHEADER_ACCEPT_NAME ()Ljava/lang/String;
950+
public final fun getHEADER_ACCEPT_VALUE_DEFER ()Ljava/lang/String;
951+
public final fun getHEADER_ACCEPT_VALUE_MULTIPART ()Ljava/lang/String;
949952
}
950953

951954
public final class com/apollographql/apollo/api/http/DefaultWebSocketPayloadComposer : com/apollographql/apollo/api/http/WebSocketPayloadComposer {

libraries/apollo-api/api/apollo-api.klib.api

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -498,6 +498,13 @@ final class com.apollographql.apollo.api.http/DefaultHttpRequestComposer : com.a
498498
final fun <#A1: com.apollographql.apollo.api/Operation.Data> compose(com.apollographql.apollo.api/ApolloRequest<#A1>): com.apollographql.apollo.api.http/HttpRequest // com.apollographql.apollo.api.http/DefaultHttpRequestComposer.compose|compose(com.apollographql.apollo.api.ApolloRequest<0:0>){0§<com.apollographql.apollo.api.Operation.Data>}[0]
499499

500500
final object Companion { // com.apollographql.apollo.api.http/DefaultHttpRequestComposer.Companion|null[0]
501+
final val HEADER_ACCEPT_NAME // com.apollographql.apollo.api.http/DefaultHttpRequestComposer.Companion.HEADER_ACCEPT_NAME|{}HEADER_ACCEPT_NAME[0]
502+
final fun <get-HEADER_ACCEPT_NAME>(): kotlin/String // com.apollographql.apollo.api.http/DefaultHttpRequestComposer.Companion.HEADER_ACCEPT_NAME.<get-HEADER_ACCEPT_NAME>|<get-HEADER_ACCEPT_NAME>(){}[0]
503+
final val HEADER_ACCEPT_VALUE_DEFER // com.apollographql.apollo.api.http/DefaultHttpRequestComposer.Companion.HEADER_ACCEPT_VALUE_DEFER|{}HEADER_ACCEPT_VALUE_DEFER[0]
504+
final fun <get-HEADER_ACCEPT_VALUE_DEFER>(): kotlin/String // com.apollographql.apollo.api.http/DefaultHttpRequestComposer.Companion.HEADER_ACCEPT_VALUE_DEFER.<get-HEADER_ACCEPT_VALUE_DEFER>|<get-HEADER_ACCEPT_VALUE_DEFER>(){}[0]
505+
final val HEADER_ACCEPT_VALUE_MULTIPART // com.apollographql.apollo.api.http/DefaultHttpRequestComposer.Companion.HEADER_ACCEPT_VALUE_MULTIPART|{}HEADER_ACCEPT_VALUE_MULTIPART[0]
506+
final fun <get-HEADER_ACCEPT_VALUE_MULTIPART>(): kotlin/String // com.apollographql.apollo.api.http/DefaultHttpRequestComposer.Companion.HEADER_ACCEPT_VALUE_MULTIPART.<get-HEADER_ACCEPT_VALUE_MULTIPART>|<get-HEADER_ACCEPT_VALUE_MULTIPART>(){}[0]
507+
501508
final fun (kotlin/String).appendQueryParameters(kotlin.collections/Map<kotlin/String, kotlin/String>): kotlin/String // com.apollographql.apollo.api.http/DefaultHttpRequestComposer.Companion.appendQueryParameters|[email protected](kotlin.collections.Map<kotlin.String,kotlin.String>){}[0]
502509
final fun <#A2: com.apollographql.apollo.api/Operation.Data> buildParamsMap(com.apollographql.apollo.api/Operation<#A2>, com.apollographql.apollo.api/CustomScalarAdapters, kotlin/Boolean, kotlin/Boolean): okio/ByteString // com.apollographql.apollo.api.http/DefaultHttpRequestComposer.Companion.buildParamsMap|buildParamsMap(com.apollographql.apollo.api.Operation<0:0>;com.apollographql.apollo.api.CustomScalarAdapters;kotlin.Boolean;kotlin.Boolean){0§<com.apollographql.apollo.api.Operation.Data>}[0]
503510
final fun <#A2: com.apollographql.apollo.api/Operation.Data> buildParamsMap(com.apollographql.apollo.api/Operation<#A2>, com.apollographql.apollo.api/CustomScalarAdapters, kotlin/Boolean, kotlin/Boolean, kotlin/Boolean): okio/ByteString // com.apollographql.apollo.api.http/DefaultHttpRequestComposer.Companion.buildParamsMap|buildParamsMap(com.apollographql.apollo.api.Operation<0:0>;com.apollographql.apollo.api.CustomScalarAdapters;kotlin.Boolean;kotlin.Boolean;kotlin.Boolean){0§<com.apollographql.apollo.api.Operation.Data>}[0]

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

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,7 @@ class DefaultHttpRequestComposer(
4646
val customScalarAdapters = apolloRequest.executionContext[CustomScalarAdapters] ?: CustomScalarAdapters.Empty
4747

4848
val requestHeaders = mutableListOf<HttpHeader>().apply {
49-
if (apolloRequest.operation is Subscription<*>) {
50-
add(HttpHeader(HEADER_ACCEPT_NAME, HEADER_ACCEPT_VALUE_SUBSCRIPTIONS))
51-
} else {
52-
add(HttpHeader(HEADER_ACCEPT_NAME, acceptHeaderQueriesAndMutations))
53-
}
49+
add(HttpHeader("Accept", if (apolloRequest.operation is Subscription<*>) HEADER_ACCEPT_VALUE_SUBSCRIPTIONS else acceptHeaderQueriesAndMutations))
5450
if (apolloRequest.httpHeaders != null) {
5551
addAll(apolloRequest.httpHeaders)
5652
}
@@ -101,9 +97,22 @@ class DefaultHttpRequestComposer(
10197
// for details.
10298
private const val HEADER_APOLLO_REQUIRE_PREFLIGHT = "Apollo-Require-Preflight"
10399

104-
private const val HEADER_ACCEPT_NAME = "Accept"
105-
private const val HEADER_ACCEPT_VALUE_QUERIES_AND_MUTATIONS = "multipart/mixed;deferSpec=20220824, application/graphql-response+json, application/json"
106-
private const val HEADER_ACCEPT_VALUE_SUBSCRIPTIONS = "multipart/mixed;subscriptionSpec=1.0, application/graphql-response+json, application/json"
100+
@Deprecated("This was made public by mistake and will be removed in a future version, please use your own constants instead")
101+
@ApolloDeprecatedSince(ApolloDeprecatedSince.Version.v5_0_0)
102+
val HEADER_ACCEPT_NAME = "Accept"
103+
104+
@Deprecated("This was made public by mistake and will be removed in a future version, please use your own constants instead")
105+
@ApolloDeprecatedSince(ApolloDeprecatedSince.Version.v5_0_0)
106+
val HEADER_ACCEPT_VALUE_DEFER = "multipart/mixed;deferSpec=20220824, application/graphql-response+json, application/json"
107+
108+
@Deprecated("This was made public by mistake and will be removed in a future version, please use your own constants instead")
109+
@ApolloDeprecatedSince(ApolloDeprecatedSince.Version.v5_0_0)
110+
val HEADER_ACCEPT_VALUE_MULTIPART = "multipart/mixed;subscriptionSpec=1.0, application/graphql-response+json, application/json"
111+
112+
private const val HEADER_ACCEPT_VALUE_QUERIES_AND_MUTATIONS =
113+
"multipart/mixed;deferSpec=20220824, application/graphql-response+json, application/json"
114+
private const val HEADER_ACCEPT_VALUE_SUBSCRIPTIONS =
115+
"multipart/mixed;subscriptionSpec=1.0, application/graphql-response+json, application/json"
107116

108117
private fun <D : Operation.Data> buildGetUrl(
109118
serverUrl: String,

0 commit comments

Comments
 (0)