Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Do not merge: show API diffs since 4.9.3 #7116

Closed
wants to merge 1 commit into from
Closed

Do not merge: show API diffs since 4.9.3 #7116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
41 changes: 31 additions & 10 deletions mockwebserver-deprecated/api/mockwebserver.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ public final class okhttp3/mockwebserver/MockResponse : java/lang/Cloneable {
public fun clone ()Lokhttp3/mockwebserver/MockResponse;
public final fun getBody ()Lokio/Buffer;
public final fun getBodyDelay (Ljava/util/concurrent/TimeUnit;)J
public final fun getDuplexResponseBody ()Lokhttp3/mockwebserver/internal/duplex/DuplexResponseBody;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

green = removal since 4.9.3

public final fun getHeaders ()Lokhttp3/Headers;
public final fun getHeadersDelay (Ljava/util/concurrent/TimeUnit;)J
public final fun getHttp2ErrorCode ()I
Expand All @@ -34,8 +35,10 @@ public final class okhttp3/mockwebserver/MockResponse : java/lang/Cloneable {
public final fun getWebSocketListener ()Lokhttp3/WebSocketListener;
public final fun headers (Lokhttp3/Headers;)V
public final fun http2ErrorCode (I)V
public final fun isDuplex ()Z
public final fun removeHeader (Ljava/lang/String;)Lokhttp3/mockwebserver/MockResponse;
public final fun setBody (Ljava/lang/String;)Lokhttp3/mockwebserver/MockResponse;
public final fun setBody (Lokhttp3/mockwebserver/internal/duplex/DuplexResponseBody;)Lokhttp3/mockwebserver/MockResponse;
public final fun setBody (Lokio/Buffer;)Lokhttp3/mockwebserver/MockResponse;
public final fun setBodyDelay (JLjava/util/concurrent/TimeUnit;)Lokhttp3/mockwebserver/MockResponse;
public final fun setChunkedBody (Ljava/lang/String;I)Lokhttp3/mockwebserver/MockResponse;
Expand Down Expand Up @@ -74,17 +77,12 @@ public final class okhttp3/mockwebserver/MockWebServer : org/junit/rules/Externa
public fun close ()V
public final fun enqueue (Lokhttp3/mockwebserver/MockResponse;)V
public final fun getBodyLimit ()J
public static fun getBodyLimit$delegate (Lokhttp3/mockwebserver/MockWebServer;)Ljava/lang/Object;
public final fun getDelegate ()Lmockwebserver3/MockWebServer;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are new since 4.9.3

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be nice if we could remove some of these, for example methods with $ or -. Would give a much clearer idea of the API.

public final fun getDispatcher ()Lokhttp3/mockwebserver/Dispatcher;
public final fun getHostName ()Ljava/lang/String;
public final fun getPort ()I
public final fun getProtocolNegotiationEnabled ()Z
public static fun getProtocolNegotiationEnabled$delegate (Lokhttp3/mockwebserver/MockWebServer;)Ljava/lang/Object;
public final fun getRequestCount ()I
public static fun getRequestCount$delegate (Lokhttp3/mockwebserver/MockWebServer;)Ljava/lang/Object;
public final fun getServerSocketFactory ()Ljavax/net/ServerSocketFactory;
public static fun getServerSocketFactory$delegate (Lokhttp3/mockwebserver/MockWebServer;)Ljava/lang/Object;
public final fun noClientAuth ()V
public final fun protocols ()Ljava/util/List;
public final fun requestClientAuth ()V
Expand Down Expand Up @@ -122,16 +120,21 @@ public final class okhttp3/mockwebserver/PushPromise {
public final fun response ()Lokhttp3/mockwebserver/MockResponse;
}

public final class okhttp3/mockwebserver/QueueDispatcher : okhttp3/mockwebserver/Dispatcher {
public class okhttp3/mockwebserver/QueueDispatcher : okhttp3/mockwebserver/Dispatcher {
public static final field Companion Lokhttp3/mockwebserver/QueueDispatcher$Companion;
public fun <init> ()V
public fun dispatch (Lokhttp3/mockwebserver/RecordedRequest;)Lokhttp3/mockwebserver/MockResponse;
public final fun enqueueResponse (Lokhttp3/mockwebserver/MockResponse;)V
public fun enqueueResponse (Lokhttp3/mockwebserver/MockResponse;)V
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this API is made final since 4.9.3

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you point out the diff where this happened?

protected final fun getResponseQueue ()Ljava/util/concurrent/BlockingQueue;
public fun peek ()Lokhttp3/mockwebserver/MockResponse;
public final fun setFailFast (Lokhttp3/mockwebserver/MockResponse;)V
public final fun setFailFast (Z)V
public fun setFailFast (Lokhttp3/mockwebserver/MockResponse;)V
public fun setFailFast (Z)V
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these also made final

public fun shutdown ()V
}

public final class okhttp3/mockwebserver/QueueDispatcher$Companion {
}

public final class okhttp3/mockwebserver/RecordedRequest {
public final fun -deprecated_utf8Body ()Ljava/lang/String;
public fun <init> (Ljava/lang/String;Lokhttp3/Headers;Ljava/util/List;JLokio/Buffer;ILjava/net/Socket;)V
Expand Down Expand Up @@ -161,7 +164,6 @@ public final class okhttp3/mockwebserver/SocketPolicy : java/lang/Enum {
public static final field DISCONNECT_AT_START Lokhttp3/mockwebserver/SocketPolicy;
public static final field DISCONNECT_DURING_REQUEST_BODY Lokhttp3/mockwebserver/SocketPolicy;
public static final field DISCONNECT_DURING_RESPONSE_BODY Lokhttp3/mockwebserver/SocketPolicy;
public static final field DO_NOT_READ_REQUEST_BODY Lokhttp3/mockwebserver/SocketPolicy;
public static final field EXPECT_CONTINUE Lokhttp3/mockwebserver/SocketPolicy;
public static final field FAIL_HANDSHAKE Lokhttp3/mockwebserver/SocketPolicy;
public static final field KEEP_OPEN Lokhttp3/mockwebserver/SocketPolicy;
Expand All @@ -176,3 +178,22 @@ public final class okhttp3/mockwebserver/SocketPolicy : java/lang/Enum {
public static fun values ()[Lokhttp3/mockwebserver/SocketPolicy;
}

public abstract interface class okhttp3/mockwebserver/internal/duplex/DuplexResponseBody {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please disregard internal I didn’t prune these

public abstract fun onRequest (Lokhttp3/mockwebserver/RecordedRequest;Lokhttp3/internal/http2/Http2Stream;)V
}

public final class okhttp3/mockwebserver/internal/duplex/MockDuplexResponseBody : okhttp3/mockwebserver/internal/duplex/DuplexResponseBody {
public fun <init> ()V
public final fun awaitSuccess ()V
public final fun cancelStream (Lokhttp3/internal/http2/ErrorCode;)Lokhttp3/mockwebserver/internal/duplex/MockDuplexResponseBody;
public final fun exhaustRequest ()Lokhttp3/mockwebserver/internal/duplex/MockDuplexResponseBody;
public final fun exhaustResponse ()Lokhttp3/mockwebserver/internal/duplex/MockDuplexResponseBody;
public fun onRequest (Lokhttp3/mockwebserver/RecordedRequest;Lokhttp3/internal/http2/Http2Stream;)V
public final fun receiveRequest (Ljava/lang/String;)Lokhttp3/mockwebserver/internal/duplex/MockDuplexResponseBody;
public final fun requestIOException ()Lokhttp3/mockwebserver/internal/duplex/MockDuplexResponseBody;
public final fun sendResponse (Ljava/lang/String;)Lokhttp3/mockwebserver/internal/duplex/MockDuplexResponseBody;
public final fun sendResponse (Ljava/lang/String;Ljava/util/concurrent/CountDownLatch;)Lokhttp3/mockwebserver/internal/duplex/MockDuplexResponseBody;
public static synthetic fun sendResponse$default (Lokhttp3/mockwebserver/internal/duplex/MockDuplexResponseBody;Ljava/lang/String;Ljava/util/concurrent/CountDownLatch;ILjava/lang/Object;)Lokhttp3/mockwebserver/internal/duplex/MockDuplexResponseBody;
public final fun sleep (JLjava/util/concurrent/TimeUnit;)Lokhttp3/mockwebserver/internal/duplex/MockDuplexResponseBody;
}

22 changes: 4 additions & 18 deletions okhttp/api/okhttp.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,9 @@ public final class okhttp3/Cache : java/io/Closeable, java/io/Flushable {
public static final field Companion Lokhttp3/Cache$Companion;
public final fun -deprecated_directory ()Ljava/io/File;
public fun <init> (Ljava/io/File;J)V
public fun <init> (Lokio/Path;JLokio/FileSystem;)V
public fun close ()V
public final fun delete ()V
public final fun directory ()Ljava/io/File;
public final fun directoryPath ()Lokio/Path;
public final fun evictAll ()V
public fun flush ()V
public final fun hitCount ()I
Expand Down Expand Up @@ -82,6 +80,7 @@ public final class okhttp3/CacheControl {
public final fun -deprecated_noTransform ()Z
public final fun -deprecated_onlyIfCached ()Z
public final fun -deprecated_sMaxAgeSeconds ()I
public synthetic fun <init> (ZZIIZZZIIZZZLjava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
public final fun immutable ()Z
public final fun isPrivate ()Z
public final fun isPublic ()Z
Expand All @@ -103,11 +102,8 @@ public final class okhttp3/CacheControl$Builder {
public final fun build ()Lokhttp3/CacheControl;
public final fun immutable ()Lokhttp3/CacheControl$Builder;
public final fun maxAge (ILjava/util/concurrent/TimeUnit;)Lokhttp3/CacheControl$Builder;
public final fun maxAge (ILkotlin/time/DurationUnit;)Lokhttp3/CacheControl$Builder;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

New! And expected

public final fun maxStale (ILjava/util/concurrent/TimeUnit;)Lokhttp3/CacheControl$Builder;
public final fun maxStale (ILkotlin/time/DurationUnit;)Lokhttp3/CacheControl$Builder;
public final fun minFresh (ILjava/util/concurrent/TimeUnit;)Lokhttp3/CacheControl$Builder;
public final fun minFresh (ILkotlin/time/DurationUnit;)Lokhttp3/CacheControl$Builder;
public final fun noCache ()Lokhttp3/CacheControl$Builder;
public final fun noStore ()Lokhttp3/CacheControl$Builder;
public final fun noTransform ()Lokhttp3/CacheControl$Builder;
Expand Down Expand Up @@ -395,7 +391,6 @@ public final class okhttp3/Cookie {
public final fun httpOnly ()Z
public final fun matches (Lokhttp3/HttpUrl;)Z
public final fun name ()Ljava/lang/String;
public final fun newBuilder ()Lokhttp3/Cookie$Builder;
public static final fun parse (Lokhttp3/HttpUrl;Ljava/lang/String;)Lokhttp3/Cookie;
public static final fun parseAll (Lokhttp3/HttpUrl;Lokhttp3/Headers;)Ljava/util/List;
public final fun path ()Ljava/lang/String;
Expand Down Expand Up @@ -564,6 +559,7 @@ public final class okhttp3/Handshake$Companion {
public final class okhttp3/Headers : java/lang/Iterable, kotlin/jvm/internal/markers/KMappedMarker {
public static final field Companion Lokhttp3/Headers$Companion;
public final fun -deprecated_size ()I
public synthetic fun <init> ([Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
public final fun byteCount ()J
public fun equals (Ljava/lang/Object;)Z
public final fun get (Ljava/lang/String;)Ljava/lang/String;
Expand Down Expand Up @@ -739,6 +735,7 @@ public final class okhttp3/MediaType {
public static final field Companion Lokhttp3/MediaType$Companion;
public final fun -deprecated_subtype ()Ljava/lang/String;
public final fun -deprecated_type ()Ljava/lang/String;
public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interesting, these look like a compiler bug Kotlin/binary-compatibility-validator#73

public final fun charset ()Ljava/nio/charset/Charset;
public final fun charset (Ljava/nio/charset/Charset;)Ljava/nio/charset/Charset;
public static synthetic fun charset$default (Lokhttp3/MediaType;Ljava/nio/charset/Charset;ILjava/lang/Object;)Ljava/nio/charset/Charset;
Expand Down Expand Up @@ -878,9 +875,9 @@ public class okhttp3/OkHttpClient : java/lang/Cloneable, okhttp3/Call$Factory, o
public final fun dispatcher ()Lokhttp3/Dispatcher;
public final fun dns ()Lokhttp3/Dns;
public final fun eventListenerFactory ()Lokhttp3/EventListener$Factory;
public final fun fastFallback ()Z
public final fun followRedirects ()Z
public final fun followSslRedirects ()Z
public final fun getRouteDatabase ()Lokhttp3/internal/connection/RouteDatabase;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice #7017

public final fun hostnameVerifier ()Ljavax/net/ssl/HostnameVerifier;
public final fun interceptors ()Ljava/util/List;
public final fun minWebSocketMessageToCompress ()J
Expand Down Expand Up @@ -922,7 +919,6 @@ public final class okhttp3/OkHttpClient$Builder {
public final fun dns (Lokhttp3/Dns;)Lokhttp3/OkHttpClient$Builder;
public final fun eventListener (Lokhttp3/EventListener;)Lokhttp3/OkHttpClient$Builder;
public final fun eventListenerFactory (Lokhttp3/EventListener$Factory;)Lokhttp3/OkHttpClient$Builder;
public final fun fastFallback (Z)Lokhttp3/OkHttpClient$Builder;
public final fun followRedirects (Z)Lokhttp3/OkHttpClient$Builder;
public final fun followSslRedirects (Z)Lokhttp3/OkHttpClient$Builder;
public final fun hostnameVerifier (Ljavax/net/ssl/HostnameVerifier;)Lokhttp3/OkHttpClient$Builder;
Expand Down Expand Up @@ -954,7 +950,6 @@ public final class okhttp3/Protocol : java/lang/Enum {
public static final field HTTP_1_0 Lokhttp3/Protocol;
public static final field HTTP_1_1 Lokhttp3/Protocol;
public static final field HTTP_2 Lokhttp3/Protocol;
public static final field HTTP_3 Lokhttp3/Protocol;
public static final field QUIC Lokhttp3/Protocol;
public static final field SPDY_3 Lokhttp3/Protocol;
public static final fun get (Ljava/lang/String;)Lokhttp3/Protocol;
Expand All @@ -975,7 +970,6 @@ public final class okhttp3/Request {
public final fun -deprecated_url ()Lokhttp3/HttpUrl;
public final fun body ()Lokhttp3/RequestBody;
public final fun cacheControl ()Lokhttp3/CacheControl;
public final fun getTags ()Ljava/util/Map;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you flagged this elsewhere.

public final fun header (Ljava/lang/String;)Ljava/lang/String;
public final fun headers ()Lokhttp3/Headers;
public final fun headers (Ljava/lang/String;)Ljava/util/List;
Expand Down Expand Up @@ -1018,7 +1012,6 @@ public abstract class okhttp3/RequestBody {
public fun contentLength ()J
public abstract fun contentType ()Lokhttp3/MediaType;
public static final fun create (Ljava/io/File;Lokhttp3/MediaType;)Lokhttp3/RequestBody;
public static final fun create (Ljava/io/FileDescriptor;Lokhttp3/MediaType;)Lokhttp3/RequestBody;
public static final fun create (Ljava/lang/String;Lokhttp3/MediaType;)Lokhttp3/RequestBody;
public static final fun create (Lokhttp3/MediaType;Ljava/io/File;)Lokhttp3/RequestBody;
public static final fun create (Lokhttp3/MediaType;Ljava/lang/String;)Lokhttp3/RequestBody;
Expand All @@ -1027,20 +1020,17 @@ public abstract class okhttp3/RequestBody {
public static final fun create (Lokhttp3/MediaType;[BI)Lokhttp3/RequestBody;
public static final fun create (Lokhttp3/MediaType;[BII)Lokhttp3/RequestBody;
public static final fun create (Lokio/ByteString;Lokhttp3/MediaType;)Lokhttp3/RequestBody;
public static final fun create (Lokio/Path;Lokio/FileSystem;Lokhttp3/MediaType;)Lokhttp3/RequestBody;
public static final fun create ([B)Lokhttp3/RequestBody;
public static final fun create ([BLokhttp3/MediaType;)Lokhttp3/RequestBody;
public static final fun create ([BLokhttp3/MediaType;I)Lokhttp3/RequestBody;
public static final fun create ([BLokhttp3/MediaType;II)Lokhttp3/RequestBody;
public static final fun gzip (Lokhttp3/RequestBody;)Lokhttp3/RequestBody;
public fun isDuplex ()Z
public fun isOneShot ()Z
public abstract fun writeTo (Lokio/BufferedSink;)V
}

public final class okhttp3/RequestBody$Companion {
public final fun create (Ljava/io/File;Lokhttp3/MediaType;)Lokhttp3/RequestBody;
public final fun create (Ljava/io/FileDescriptor;Lokhttp3/MediaType;)Lokhttp3/RequestBody;
public final fun create (Ljava/lang/String;Lokhttp3/MediaType;)Lokhttp3/RequestBody;
public final fun create (Lokhttp3/MediaType;Ljava/io/File;)Lokhttp3/RequestBody;
public final fun create (Lokhttp3/MediaType;Ljava/lang/String;)Lokhttp3/RequestBody;
Expand All @@ -1049,19 +1039,15 @@ public final class okhttp3/RequestBody$Companion {
public final fun create (Lokhttp3/MediaType;[BI)Lokhttp3/RequestBody;
public final fun create (Lokhttp3/MediaType;[BII)Lokhttp3/RequestBody;
public final fun create (Lokio/ByteString;Lokhttp3/MediaType;)Lokhttp3/RequestBody;
public final fun create (Lokio/Path;Lokio/FileSystem;Lokhttp3/MediaType;)Lokhttp3/RequestBody;
public final fun create ([B)Lokhttp3/RequestBody;
public final fun create ([BLokhttp3/MediaType;)Lokhttp3/RequestBody;
public final fun create ([BLokhttp3/MediaType;I)Lokhttp3/RequestBody;
public final fun create ([BLokhttp3/MediaType;II)Lokhttp3/RequestBody;
public static synthetic fun create$default (Lokhttp3/RequestBody$Companion;Ljava/io/File;Lokhttp3/MediaType;ILjava/lang/Object;)Lokhttp3/RequestBody;
public static synthetic fun create$default (Lokhttp3/RequestBody$Companion;Ljava/io/FileDescriptor;Lokhttp3/MediaType;ILjava/lang/Object;)Lokhttp3/RequestBody;
public static synthetic fun create$default (Lokhttp3/RequestBody$Companion;Ljava/lang/String;Lokhttp3/MediaType;ILjava/lang/Object;)Lokhttp3/RequestBody;
public static synthetic fun create$default (Lokhttp3/RequestBody$Companion;Lokhttp3/MediaType;[BIIILjava/lang/Object;)Lokhttp3/RequestBody;
public static synthetic fun create$default (Lokhttp3/RequestBody$Companion;Lokio/ByteString;Lokhttp3/MediaType;ILjava/lang/Object;)Lokhttp3/RequestBody;
public static synthetic fun create$default (Lokhttp3/RequestBody$Companion;Lokio/Path;Lokio/FileSystem;Lokhttp3/MediaType;ILjava/lang/Object;)Lokhttp3/RequestBody;
public static synthetic fun create$default (Lokhttp3/RequestBody$Companion;[BLokhttp3/MediaType;IIILjava/lang/Object;)Lokhttp3/RequestBody;
public final fun gzip (Lokhttp3/RequestBody;)Lokhttp3/RequestBody;
}

public final class okhttp3/Response : java/io/Closeable {
Expand Down