Skip to content

Commit eec7001

Browse files
BoDBoD
committed
Revert handling incremental results in WebSocket
1 parent a14e3b3 commit eec7001

File tree

13 files changed

+159
-73
lines changed

13 files changed

+159
-73
lines changed

‎libraries/apollo-runtime/api/android/apollo-runtime.api‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,14 @@ public final class com/apollographql/apollo/internal/MultipartReader$Part : java
229229
public final fun getHeaders ()Ljava/util/List;
230230
}
231231

232+
public final class com/apollographql/apollo/network/IncrementalDeliveryProtocol : java/lang/Enum {
233+
public static final field GraphQL17Alpha2 Lcom/apollographql/apollo/network/IncrementalDeliveryProtocol;
234+
public static final field GraphQL17Alpha9 Lcom/apollographql/apollo/network/IncrementalDeliveryProtocol;
235+
public static fun getEntries ()Lkotlin/enums/EnumEntries;
236+
public static fun valueOf (Ljava/lang/String;)Lcom/apollographql/apollo/network/IncrementalDeliveryProtocol;
237+
public static fun values ()[Lcom/apollographql/apollo/network/IncrementalDeliveryProtocol;
238+
}
239+
232240
public abstract interface class com/apollographql/apollo/network/NetworkMonitor : java/io/Closeable {
233241
public abstract fun isOnline ()Lkotlinx/coroutines/flow/StateFlow;
234242
}
@@ -355,7 +363,7 @@ public final class com/apollographql/apollo/network/http/HttpNetworkTransport$Bu
355363
public final fun httpEngine (Lcom/apollographql/apollo/network/http/HttpEngine;)Lcom/apollographql/apollo/network/http/HttpNetworkTransport$Builder;
356364
public final fun httpHeaders (Ljava/util/List;)Lcom/apollographql/apollo/network/http/HttpNetworkTransport$Builder;
357365
public final fun httpRequestComposer (Lcom/apollographql/apollo/api/http/HttpRequestComposer;)Lcom/apollographql/apollo/network/http/HttpNetworkTransport$Builder;
358-
public final fun incrementalDeliveryProtocol (Lcom/apollographql/apollo/network/http/HttpNetworkTransport$IncrementalDeliveryProtocol;)Lcom/apollographql/apollo/network/http/HttpNetworkTransport$Builder;
366+
public final fun incrementalDeliveryProtocol (Lcom/apollographql/apollo/network/IncrementalDeliveryProtocol;)Lcom/apollographql/apollo/network/http/HttpNetworkTransport$Builder;
359367
public final fun interceptors (Ljava/util/List;)Lcom/apollographql/apollo/network/http/HttpNetworkTransport$Builder;
360368
public final fun serverUrl (Ljava/lang/String;)Lcom/apollographql/apollo/network/http/HttpNetworkTransport$Builder;
361369
}
@@ -365,14 +373,6 @@ public final class com/apollographql/apollo/network/http/HttpNetworkTransport$En
365373
public fun intercept (Lcom/apollographql/apollo/api/http/HttpRequest;Lcom/apollographql/apollo/network/http/HttpInterceptorChain;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
366374
}
367375

368-
public final class com/apollographql/apollo/network/http/HttpNetworkTransport$IncrementalDeliveryProtocol : java/lang/Enum {
369-
public static final field GraphQL17Alpha2 Lcom/apollographql/apollo/network/http/HttpNetworkTransport$IncrementalDeliveryProtocol;
370-
public static final field GraphQL17Alpha9 Lcom/apollographql/apollo/network/http/HttpNetworkTransport$IncrementalDeliveryProtocol;
371-
public static fun getEntries ()Lkotlin/enums/EnumEntries;
372-
public static fun valueOf (Ljava/lang/String;)Lcom/apollographql/apollo/network/http/HttpNetworkTransport$IncrementalDeliveryProtocol;
373-
public static fun values ()[Lcom/apollographql/apollo/network/http/HttpNetworkTransport$IncrementalDeliveryProtocol;
374-
}
375-
376376
public final class com/apollographql/apollo/network/http/LoggingInterceptor : com/apollographql/apollo/network/http/HttpInterceptor {
377377
public fun <init> ()V
378378
public fun <init> (Lcom/apollographql/apollo/network/http/LoggingInterceptor$Level;Lkotlin/jvm/functions/Function1;)V
@@ -544,6 +544,7 @@ public final class com/apollographql/apollo/network/websocket/WebSocketNetworkTr
544544
public final fun build ()Lcom/apollographql/apollo/network/websocket/WebSocketNetworkTransport;
545545
public final fun connectionAcknowledgeTimeout-BwNAW2A (Lkotlin/time/Duration;)Lcom/apollographql/apollo/network/websocket/WebSocketNetworkTransport$Builder;
546546
public final fun idleTimeout-BwNAW2A (Lkotlin/time/Duration;)Lcom/apollographql/apollo/network/websocket/WebSocketNetworkTransport$Builder;
547+
public final fun incrementalDeliveryProtocol (Lcom/apollographql/apollo/network/IncrementalDeliveryProtocol;)Lcom/apollographql/apollo/network/websocket/WebSocketNetworkTransport$Builder;
547548
public final fun parserFactory (Lcom/apollographql/apollo/network/websocket/SubscriptionParserFactory;)Lcom/apollographql/apollo/network/websocket/WebSocketNetworkTransport$Builder;
548549
public final fun pingInterval-BwNAW2A (Lkotlin/time/Duration;)Lcom/apollographql/apollo/network/websocket/WebSocketNetworkTransport$Builder;
549550
public final fun serverUrl (Ljava/lang/String;)Lcom/apollographql/apollo/network/websocket/WebSocketNetworkTransport$Builder;
@@ -672,7 +673,7 @@ public final class com/apollographql/apollo/network/ws/WebSocketEngineKt {
672673
}
673674

674675
public final class com/apollographql/apollo/network/ws/WebSocketNetworkTransport : com/apollographql/apollo/network/NetworkTransport {
675-
public synthetic fun <init> (Lkotlin/jvm/functions/Function1;Ljava/util/List;Lcom/apollographql/apollo/network/ws/WebSocketEngine;JLcom/apollographql/apollo/network/ws/WsProtocol$Factory;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
676+
public synthetic fun <init> (Lkotlin/jvm/functions/Function1;Ljava/util/List;Lcom/apollographql/apollo/network/ws/WebSocketEngine;JLcom/apollographql/apollo/network/ws/WsProtocol$Factory;Lkotlin/jvm/functions/Function3;Lcom/apollographql/apollo/internal/incremental/IncrementalDeliveryProtocolImpl;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
676677
public final fun closeConnection (Ljava/lang/Throwable;)V
677678
public fun dispose ()V
678679
public fun execute (Lcom/apollographql/apollo/api/ApolloRequest;)Lkotlinx/coroutines/flow/Flow;
@@ -686,6 +687,7 @@ public final class com/apollographql/apollo/network/ws/WebSocketNetworkTransport
686687
public final fun build ()Lcom/apollographql/apollo/network/ws/WebSocketNetworkTransport;
687688
public final fun headers (Ljava/util/List;)Lcom/apollographql/apollo/network/ws/WebSocketNetworkTransport$Builder;
688689
public final fun idleTimeoutMillis (J)Lcom/apollographql/apollo/network/ws/WebSocketNetworkTransport$Builder;
690+
public final fun incrementalDeliveryProtocol (Lcom/apollographql/apollo/network/IncrementalDeliveryProtocol;)Lcom/apollographql/apollo/network/ws/WebSocketNetworkTransport$Builder;
689691
public final fun protocol (Lcom/apollographql/apollo/network/ws/WsProtocol$Factory;)Lcom/apollographql/apollo/network/ws/WebSocketNetworkTransport$Builder;
690692
public final fun reopenWhen (Lkotlin/jvm/functions/Function3;)Lcom/apollographql/apollo/network/ws/WebSocketNetworkTransport$Builder;
691693
public final fun serverUrl (Ljava/lang/String;)Lcom/apollographql/apollo/network/ws/WebSocketNetworkTransport$Builder;

‎libraries/apollo-runtime/api/apollo-runtime.klib.api‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,17 @@ final enum class com.apollographql.apollo.network.ws/WsFrameType : kotlin/Enum<c
2121
final fun values(): kotlin/Array<com.apollographql.apollo.network.ws/WsFrameType> // com.apollographql.apollo.network.ws/WsFrameType.values|values#static(){}[0]
2222
}
2323

24+
final enum class com.apollographql.apollo.network/IncrementalDeliveryProtocol : kotlin/Enum<com.apollographql.apollo.network/IncrementalDeliveryProtocol> { // com.apollographql.apollo.network/IncrementalDeliveryProtocol|null[0]
25+
enum entry GraphQL17Alpha2 // com.apollographql.apollo.network/IncrementalDeliveryProtocol.GraphQL17Alpha2|null[0]
26+
enum entry GraphQL17Alpha9 // com.apollographql.apollo.network/IncrementalDeliveryProtocol.GraphQL17Alpha9|null[0]
27+
28+
final val entries // com.apollographql.apollo.network/IncrementalDeliveryProtocol.entries|#static{}entries[0]
29+
final fun <get-entries>(): kotlin.enums/EnumEntries<com.apollographql.apollo.network/IncrementalDeliveryProtocol> // com.apollographql.apollo.network/IncrementalDeliveryProtocol.entries.<get-entries>|<get-entries>#static(){}[0]
30+
31+
final fun valueOf(kotlin/String): com.apollographql.apollo.network/IncrementalDeliveryProtocol // com.apollographql.apollo.network/IncrementalDeliveryProtocol.valueOf|valueOf#static(kotlin.String){}[0]
32+
final fun values(): kotlin/Array<com.apollographql.apollo.network/IncrementalDeliveryProtocol> // com.apollographql.apollo.network/IncrementalDeliveryProtocol.values|values#static(){}[0]
33+
}
34+
2435
abstract interface <#A: com.apollographql.apollo.api/Operation.Data> com.apollographql.apollo.network.websocket/SubscriptionParser { // com.apollographql.apollo.network.websocket/SubscriptionParser|null[0]
2536
abstract fun parse(kotlin/Any?): com.apollographql.apollo.api/ApolloResponse<#A>? // com.apollographql.apollo.network.websocket/SubscriptionParser.parse|parse(kotlin.Any?){}[0]
2637
}
@@ -294,17 +305,6 @@ final class com.apollographql.apollo.network.http/HttpNetworkTransport : com.apo
294305
final fun dispose() // com.apollographql.apollo.network.http/HttpNetworkTransport.dispose|dispose(){}[0]
295306
final fun newBuilder(): com.apollographql.apollo.network.http/HttpNetworkTransport.Builder // com.apollographql.apollo.network.http/HttpNetworkTransport.newBuilder|newBuilder(){}[0]
296307

297-
final enum class IncrementalDeliveryProtocol : kotlin/Enum<com.apollographql.apollo.network.http/HttpNetworkTransport.IncrementalDeliveryProtocol> { // com.apollographql.apollo.network.http/HttpNetworkTransport.IncrementalDeliveryProtocol|null[0]
298-
enum entry GraphQL17Alpha2 // com.apollographql.apollo.network.http/HttpNetworkTransport.IncrementalDeliveryProtocol.GraphQL17Alpha2|null[0]
299-
enum entry GraphQL17Alpha9 // com.apollographql.apollo.network.http/HttpNetworkTransport.IncrementalDeliveryProtocol.GraphQL17Alpha9|null[0]
300-
301-
final val entries // com.apollographql.apollo.network.http/HttpNetworkTransport.IncrementalDeliveryProtocol.entries|#static{}entries[0]
302-
final fun <get-entries>(): kotlin.enums/EnumEntries<com.apollographql.apollo.network.http/HttpNetworkTransport.IncrementalDeliveryProtocol> // com.apollographql.apollo.network.http/HttpNetworkTransport.IncrementalDeliveryProtocol.entries.<get-entries>|<get-entries>#static(){}[0]
303-
304-
final fun valueOf(kotlin/String): com.apollographql.apollo.network.http/HttpNetworkTransport.IncrementalDeliveryProtocol // com.apollographql.apollo.network.http/HttpNetworkTransport.IncrementalDeliveryProtocol.valueOf|valueOf#static(kotlin.String){}[0]
305-
final fun values(): kotlin/Array<com.apollographql.apollo.network.http/HttpNetworkTransport.IncrementalDeliveryProtocol> // com.apollographql.apollo.network.http/HttpNetworkTransport.IncrementalDeliveryProtocol.values|values#static(){}[0]
306-
}
307-
308308
final class Builder { // com.apollographql.apollo.network.http/HttpNetworkTransport.Builder|null[0]
309309
constructor <init>() // com.apollographql.apollo.network.http/HttpNetworkTransport.Builder.<init>|<init>(){}[0]
310310

@@ -315,7 +315,7 @@ final class com.apollographql.apollo.network.http/HttpNetworkTransport : com.apo
315315
final fun httpEngine(com.apollographql.apollo.network.http/HttpEngine): com.apollographql.apollo.network.http/HttpNetworkTransport.Builder // com.apollographql.apollo.network.http/HttpNetworkTransport.Builder.httpEngine|httpEngine(com.apollographql.apollo.network.http.HttpEngine){}[0]
316316
final fun httpHeaders(kotlin.collections/List<com.apollographql.apollo.api.http/HttpHeader>): com.apollographql.apollo.network.http/HttpNetworkTransport.Builder // com.apollographql.apollo.network.http/HttpNetworkTransport.Builder.httpHeaders|httpHeaders(kotlin.collections.List<com.apollographql.apollo.api.http.HttpHeader>){}[0]
317317
final fun httpRequestComposer(com.apollographql.apollo.api.http/HttpRequestComposer): com.apollographql.apollo.network.http/HttpNetworkTransport.Builder // com.apollographql.apollo.network.http/HttpNetworkTransport.Builder.httpRequestComposer|httpRequestComposer(com.apollographql.apollo.api.http.HttpRequestComposer){}[0]
318-
final fun incrementalDeliveryProtocol(com.apollographql.apollo.network.http/HttpNetworkTransport.IncrementalDeliveryProtocol): com.apollographql.apollo.network.http/HttpNetworkTransport.Builder // com.apollographql.apollo.network.http/HttpNetworkTransport.Builder.incrementalDeliveryProtocol|incrementalDeliveryProtocol(com.apollographql.apollo.network.http.HttpNetworkTransport.IncrementalDeliveryProtocol){}[0]
318+
final fun incrementalDeliveryProtocol(com.apollographql.apollo.network/IncrementalDeliveryProtocol): com.apollographql.apollo.network.http/HttpNetworkTransport.Builder // com.apollographql.apollo.network.http/HttpNetworkTransport.Builder.incrementalDeliveryProtocol|incrementalDeliveryProtocol(com.apollographql.apollo.network.IncrementalDeliveryProtocol){}[0]
319319
final fun interceptors(kotlin.collections/List<com.apollographql.apollo.network.http/HttpInterceptor>): com.apollographql.apollo.network.http/HttpNetworkTransport.Builder // com.apollographql.apollo.network.http/HttpNetworkTransport.Builder.interceptors|interceptors(kotlin.collections.List<com.apollographql.apollo.network.http.HttpInterceptor>){}[0]
320320
final fun serverUrl(kotlin/String): com.apollographql.apollo.network.http/HttpNetworkTransport.Builder // com.apollographql.apollo.network.http/HttpNetworkTransport.Builder.serverUrl|serverUrl(kotlin.String){}[0]
321321
}
@@ -463,6 +463,7 @@ final class com.apollographql.apollo.network.websocket/WebSocketNetworkTransport
463463
final fun build(): com.apollographql.apollo.network.websocket/WebSocketNetworkTransport // com.apollographql.apollo.network.websocket/WebSocketNetworkTransport.Builder.build|build(){}[0]
464464
final fun connectionAcknowledgeTimeout(kotlin.time/Duration?): com.apollographql.apollo.network.websocket/WebSocketNetworkTransport.Builder // com.apollographql.apollo.network.websocket/WebSocketNetworkTransport.Builder.connectionAcknowledgeTimeout|connectionAcknowledgeTimeout(kotlin.time.Duration?){}[0]
465465
final fun idleTimeout(kotlin.time/Duration?): com.apollographql.apollo.network.websocket/WebSocketNetworkTransport.Builder // com.apollographql.apollo.network.websocket/WebSocketNetworkTransport.Builder.idleTimeout|idleTimeout(kotlin.time.Duration?){}[0]
466+
final fun incrementalDeliveryProtocol(com.apollographql.apollo.network/IncrementalDeliveryProtocol): com.apollographql.apollo.network.websocket/WebSocketNetworkTransport.Builder // com.apollographql.apollo.network.websocket/WebSocketNetworkTransport.Builder.incrementalDeliveryProtocol|incrementalDeliveryProtocol(com.apollographql.apollo.network.IncrementalDeliveryProtocol){}[0]
466467
final fun parserFactory(com.apollographql.apollo.network.websocket/SubscriptionParserFactory?): com.apollographql.apollo.network.websocket/WebSocketNetworkTransport.Builder // com.apollographql.apollo.network.websocket/WebSocketNetworkTransport.Builder.parserFactory|parserFactory(com.apollographql.apollo.network.websocket.SubscriptionParserFactory?){}[0]
467468
final fun pingInterval(kotlin.time/Duration?): com.apollographql.apollo.network.websocket/WebSocketNetworkTransport.Builder // com.apollographql.apollo.network.websocket/WebSocketNetworkTransport.Builder.pingInterval|pingInterval(kotlin.time.Duration?){}[0]
468469
final fun serverUrl(kotlin/String?): com.apollographql.apollo.network.websocket/WebSocketNetworkTransport.Builder // com.apollographql.apollo.network.websocket/WebSocketNetworkTransport.Builder.serverUrl|serverUrl(kotlin.String?){}[0]
@@ -565,6 +566,7 @@ final class com.apollographql.apollo.network.ws/WebSocketNetworkTransport : com.
565566
final fun build(): com.apollographql.apollo.network.ws/WebSocketNetworkTransport // com.apollographql.apollo.network.ws/WebSocketNetworkTransport.Builder.build|build(){}[0]
566567
final fun headers(kotlin.collections/List<com.apollographql.apollo.api.http/HttpHeader>): com.apollographql.apollo.network.ws/WebSocketNetworkTransport.Builder // com.apollographql.apollo.network.ws/WebSocketNetworkTransport.Builder.headers|headers(kotlin.collections.List<com.apollographql.apollo.api.http.HttpHeader>){}[0]
567568
final fun idleTimeoutMillis(kotlin/Long): com.apollographql.apollo.network.ws/WebSocketNetworkTransport.Builder // com.apollographql.apollo.network.ws/WebSocketNetworkTransport.Builder.idleTimeoutMillis|idleTimeoutMillis(kotlin.Long){}[0]
569+
final fun incrementalDeliveryProtocol(com.apollographql.apollo.network/IncrementalDeliveryProtocol): com.apollographql.apollo.network.ws/WebSocketNetworkTransport.Builder // com.apollographql.apollo.network.ws/WebSocketNetworkTransport.Builder.incrementalDeliveryProtocol|incrementalDeliveryProtocol(com.apollographql.apollo.network.IncrementalDeliveryProtocol){}[0]
568570
final fun protocol(com.apollographql.apollo.network.ws/WsProtocol.Factory): com.apollographql.apollo.network.ws/WebSocketNetworkTransport.Builder // com.apollographql.apollo.network.ws/WebSocketNetworkTransport.Builder.protocol|protocol(com.apollographql.apollo.network.ws.WsProtocol.Factory){}[0]
569571
final fun reopenWhen(kotlin.coroutines/SuspendFunction2<kotlin/Throwable, kotlin/Long, kotlin/Boolean>?): com.apollographql.apollo.network.ws/WebSocketNetworkTransport.Builder // com.apollographql.apollo.network.ws/WebSocketNetworkTransport.Builder.reopenWhen|reopenWhen(kotlin.coroutines.SuspendFunction2<kotlin.Throwable,kotlin.Long,kotlin.Boolean>?){}[0]
570572
final fun serverUrl(kotlin.coroutines/SuspendFunction0<kotlin/String>?): com.apollographql.apollo.network.ws/WebSocketNetworkTransport.Builder // com.apollographql.apollo.network.ws/WebSocketNetworkTransport.Builder.serverUrl|serverUrl(kotlin.coroutines.SuspendFunction0<kotlin.String>?){}[0]

0 commit comments

Comments
 (0)