android/okhttp
1
0
Fork 0
mirror of https://github.com/square/okhttp.git synced 2025-08-08 23:42:08 +03:00
Code Releases Activity

Update dependency com.diffplug.spotless:spotless-plugin-gradle to v7 (#8702)

Browse Source 
* Update dependency com.diffplug.spotless:spotless-plugin-gradle to v7

* Reformat

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Jake Wharton <jw@squareup.com>
This commit is contained in:
renovate[bot]
2025-03-19 15:25:20 -04:00
committed by GitHub
parent c4d472cab7
commit a51cfbf841
304 changed files with 6747 additions and 4401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
okhttp-testing-support/src/main/kotlin/okhttp3/DelegatingSSLSession.kt
View File

@@ -23,30 +23,22 @@ import javax.net.ssl.SSLSessionContext
import javax.security.cert.X509Certificate
/** An [SSLSession] that delegates all calls. */
abstract class DelegatingSSLSession(protected val delegate: SSLSession?) : SSLSession {
override fun getId(): ByteArray {
return delegate!!.id
}
abstract class DelegatingSSLSession(
protected val delegate: SSLSession?,
) : SSLSession {
override fun getId(): ByteArray = delegate!!.id
override fun getSessionContext(): SSLSessionContext {
return delegate!!.sessionContext
}
override fun getSessionContext(): SSLSessionContext = delegate!!.sessionContext
override fun getCreationTime(): Long {
return delegate!!.creationTime
}
override fun getCreationTime(): Long = delegate!!.creationTime
override fun getLastAccessedTime(): Long {
return delegate!!.lastAccessedTime
}
override fun getLastAccessedTime(): Long = delegate!!.lastAccessedTime
override fun invalidate() {
delegate!!.invalidate()
}
override fun isValid(): Boolean {
return delegate!!.isValid
}
override fun isValid(): Boolean = delegate!!.isValid
override fun putValue(
s: String,
@@ -55,62 +47,36 @@ abstract class DelegatingSSLSession(protected val delegate: SSLSession?) : SSLSe
delegate!!.putValue(s, o)
}
override fun getValue(s: String): Any {
return delegate!!.getValue(s)
}
override fun getValue(s: String): Any = delegate!!.getValue(s)
override fun removeValue(s: String) {
delegate!!.removeValue(s)
}
override fun getValueNames(): Array<String> {
return delegate!!.valueNames
}
override fun getValueNames(): Array<String> = delegate!!.valueNames
@Throws(SSLPeerUnverifiedException::class)
override fun getPeerCertificates(): Array<Certificate>? {
return delegate!!.peerCertificates
}
override fun getPeerCertificates(): Array<Certificate>? = delegate!!.peerCertificates
override fun getLocalCertificates(): Array<Certificate>? {
return delegate!!.localCertificates
}
override fun getLocalCertificates(): Array<Certificate>? = delegate!!.localCertificates
@Throws(SSLPeerUnverifiedException::class)
override fun getPeerCertificateChain(): Array<X509Certificate> {
return delegate!!.peerCertificateChain
}
override fun getPeerCertificateChain(): Array<X509Certificate> = delegate!!.peerCertificateChain
@Throws(SSLPeerUnverifiedException::class)
override fun getPeerPrincipal(): Principal {
return delegate!!.peerPrincipal
}
override fun getPeerPrincipal(): Principal = delegate!!.peerPrincipal
override fun getLocalPrincipal(): Principal {
return delegate!!.localPrincipal
}
override fun getLocalPrincipal(): Principal = delegate!!.localPrincipal
override fun getCipherSuite(): String {
return delegate!!.cipherSuite
}
override fun getCipherSuite(): String = delegate!!.cipherSuite
override fun getProtocol(): String {
return delegate!!.protocol
}
override fun getProtocol(): String = delegate!!.protocol
override fun getPeerHost(): String {
return delegate!!.peerHost
}
override fun getPeerHost(): String = delegate!!.peerHost
override fun getPeerPort(): Int {
return delegate!!.peerPort
}
override fun getPeerPort(): Int = delegate!!.peerPort
override fun getPacketBufferSize(): Int {
return delegate!!.packetBufferSize
}
override fun getPacketBufferSize(): Int = delegate!!.packetBufferSize
override fun getApplicationBufferSize(): Int {
return delegate!!.applicationBufferSize
}
override fun getApplicationBufferSize(): Int = delegate!!.applicationBufferSize
}

157
okhttp-testing-support/src/main/kotlin/okhttp3/DelegatingSSLSocket.kt
View File

@@ -29,7 +29,9 @@ import javax.net.ssl.SSLSession
import javax.net.ssl.SSLSocket
/** An [SSLSocket] that delegates all calls. */
abstract class DelegatingSSLSocket(protected val delegate: SSLSocket?) : SSLSocket() {
abstract class DelegatingSSLSocket(
protected val delegate: SSLSocket?,
) : SSLSocket() {
@Throws(IOException::class)
override fun shutdownInput() {
delegate!!.shutdownInput()
@@ -40,33 +42,23 @@ abstract class DelegatingSSLSocket(protected val delegate: SSLSocket?) : SSLSock
delegate!!.shutdownOutput()
}
override fun getSupportedCipherSuites(): Array<String> {
return delegate!!.supportedCipherSuites
}
override fun getSupportedCipherSuites(): Array<String> = delegate!!.supportedCipherSuites
override fun getEnabledCipherSuites(): Array<String> {
return delegate!!.enabledCipherSuites
}
override fun getEnabledCipherSuites(): Array<String> = delegate!!.enabledCipherSuites
override fun setEnabledCipherSuites(suites: Array<String>) {
delegate!!.enabledCipherSuites = suites
}
override fun getSupportedProtocols(): Array<String> {
return delegate!!.supportedProtocols
}
override fun getSupportedProtocols(): Array<String> = delegate!!.supportedProtocols
override fun getEnabledProtocols(): Array<String> {
return delegate!!.enabledProtocols
}
override fun getEnabledProtocols(): Array<String> = delegate!!.enabledProtocols
override fun setEnabledProtocols(protocols: Array<String>) {
delegate!!.enabledProtocols = protocols
}
override fun getSession(): SSLSession {
return delegate!!.session
}
override fun getSession(): SSLSession = delegate!!.session
override fun addHandshakeCompletedListener(listener: HandshakeCompletedListener) {
delegate!!.addHandshakeCompletedListener(listener)
@@ -85,9 +77,7 @@ abstract class DelegatingSSLSocket(protected val delegate: SSLSocket?) : SSLSock
delegate!!.useClientMode = mode
}
override fun getUseClientMode(): Boolean {
return delegate!!.useClientMode
}
override fun getUseClientMode(): Boolean = delegate!!.useClientMode
override fun setNeedClientAuth(need: Boolean) {
delegate!!.needClientAuth = need
@@ -97,25 +87,17 @@ abstract class DelegatingSSLSocket(protected val delegate: SSLSocket?) : SSLSock
delegate!!.wantClientAuth = want
}
override fun getNeedClientAuth(): Boolean {
return delegate!!.needClientAuth
}
override fun getNeedClientAuth(): Boolean = delegate!!.needClientAuth
override fun getWantClientAuth(): Boolean {
return delegate!!.wantClientAuth
}
override fun getWantClientAuth(): Boolean = delegate!!.wantClientAuth
override fun setEnableSessionCreation(flag: Boolean) {
delegate!!.enableSessionCreation = flag
}
override fun getEnableSessionCreation(): Boolean {
return delegate!!.enableSessionCreation
}
override fun getEnableSessionCreation(): Boolean = delegate!!.enableSessionCreation
override fun getSSLParameters(): SSLParameters {
return delegate!!.sslParameters
}
override fun getSSLParameters(): SSLParameters = delegate!!.sslParameters
override fun setSSLParameters(p: SSLParameters) {
delegate!!.sslParameters = p
@@ -126,61 +108,37 @@ abstract class DelegatingSSLSocket(protected val delegate: SSLSocket?) : SSLSock
delegate!!.close()
}
override fun getInetAddress(): InetAddress {
return delegate!!.inetAddress
}
override fun getInetAddress(): InetAddress = delegate!!.inetAddress
@Throws(IOException::class)
override fun getInputStream(): InputStream {
return delegate!!.inputStream
}
override fun getInputStream(): InputStream = delegate!!.inputStream
@Throws(SocketException::class)
override fun getKeepAlive(): Boolean {
return delegate!!.keepAlive
}
override fun getKeepAlive(): Boolean = delegate!!.keepAlive
override fun getLocalAddress(): InetAddress {
return delegate!!.localAddress
}
override fun getLocalAddress(): InetAddress = delegate!!.localAddress
override fun getLocalPort(): Int {
return delegate!!.localPort
}
override fun getLocalPort(): Int = delegate!!.localPort
@Throws(IOException::class)
override fun getOutputStream(): OutputStream {
return delegate!!.outputStream
}
override fun getOutputStream(): OutputStream = delegate!!.outputStream
override fun getPort(): Int {
return delegate!!.port
}
override fun getPort(): Int = delegate!!.port
@Throws(SocketException::class)
override fun getSoLinger(): Int {
return delegate!!.soLinger
}
override fun getSoLinger(): Int = delegate!!.soLinger
@Throws(SocketException::class)
override fun getReceiveBufferSize(): Int {
return delegate!!.receiveBufferSize
}
override fun getReceiveBufferSize(): Int = delegate!!.receiveBufferSize
@Throws(SocketException::class)
override fun getSendBufferSize(): Int {
return delegate!!.sendBufferSize
}
override fun getSendBufferSize(): Int = delegate!!.sendBufferSize
@Throws(SocketException::class)
override fun getSoTimeout(): Int {
return delegate!!.soTimeout
}
override fun getSoTimeout(): Int = delegate!!.soTimeout
@Throws(SocketException::class)
override fun getTcpNoDelay(): Boolean {
return delegate!!.tcpNoDelay
}
override fun getTcpNoDelay(): Boolean = delegate!!.tcpNoDelay
@Throws(SocketException::class)
override fun setKeepAlive(keepAlive: Boolean) {
@@ -215,29 +173,17 @@ abstract class DelegatingSSLSocket(protected val delegate: SSLSocket?) : SSLSock
delegate!!.tcpNoDelay = on
}
override fun toString(): String {
return delegate!!.toString()
}
override fun toString(): String = delegate!!.toString()
override fun getLocalSocketAddress(): SocketAddress {
return delegate!!.localSocketAddress
}
override fun getLocalSocketAddress(): SocketAddress = delegate!!.localSocketAddress
override fun getRemoteSocketAddress(): SocketAddress {
return delegate!!.remoteSocketAddress
}
override fun getRemoteSocketAddress(): SocketAddress = delegate!!.remoteSocketAddress
override fun isBound(): Boolean {
return delegate!!.isBound
}
override fun isBound(): Boolean = delegate!!.isBound
override fun isConnected(): Boolean {
return delegate!!.isConnected
}
override fun isConnected(): Boolean = delegate!!.isConnected
override fun isClosed(): Boolean {
return delegate!!.isClosed
}
override fun isClosed(): Boolean = delegate!!.isClosed
@Throws(IOException::class)
override fun bind(localAddr: SocketAddress) {
@@ -257,13 +203,9 @@ abstract class DelegatingSSLSocket(protected val delegate: SSLSocket?) : SSLSock
delegate!!.connect(remoteAddr, timeout)
}
override fun isInputShutdown(): Boolean {
return delegate!!.isInputShutdown
}
override fun isInputShutdown(): Boolean = delegate!!.isInputShutdown
override fun isOutputShutdown(): Boolean {
return delegate!!.isOutputShutdown
}
override fun isOutputShutdown(): Boolean = delegate!!.isOutputShutdown
@Throws(SocketException::class)
override fun setReuseAddress(reuse: Boolean) {
@@ -271,9 +213,7 @@ abstract class DelegatingSSLSocket(protected val delegate: SSLSocket?) : SSLSock
}
@Throws(SocketException::class)
override fun getReuseAddress(): Boolean {
return delegate!!.reuseAddress
}
override fun getReuseAddress(): Boolean = delegate!!.reuseAddress
@Throws(SocketException::class)
override fun setOOBInline(oobinline: Boolean) {
@@ -281,9 +221,7 @@ abstract class DelegatingSSLSocket(protected val delegate: SSLSocket?) : SSLSock
}
@Throws(SocketException::class)
override fun getOOBInline(): Boolean {
return delegate!!.oobInline
}
override fun getOOBInline(): Boolean = delegate!!.oobInline
@Throws(SocketException::class)
override fun setTrafficClass(value: Int) {
@@ -291,36 +229,25 @@ abstract class DelegatingSSLSocket(protected val delegate: SSLSocket?) : SSLSock
}
@Throws(SocketException::class)
override fun getTrafficClass(): Int {
return delegate!!.trafficClass
}
override fun getTrafficClass(): Int = delegate!!.trafficClass
@Throws(IOException::class)
override fun sendUrgentData(value: Int) {
delegate!!.sendUrgentData(value)
}
override fun getChannel(): SocketChannel {
return delegate!!.channel
}
override fun getChannel(): SocketChannel = delegate!!.channel
override fun getHandshakeSession(): SSLSession {
return delegate!!.handshakeSession
}
override fun getHandshakeSession(): SSLSession = delegate!!.handshakeSession
override fun getApplicationProtocol(): String {
return delegate!!.applicationProtocol
}
override fun getApplicationProtocol(): String = delegate!!.applicationProtocol
override fun getHandshakeApplicationProtocol(): String {
return delegate!!.handshakeApplicationProtocol
}
override fun getHandshakeApplicationProtocol(): String = delegate!!.handshakeApplicationProtocol
override fun setHandshakeApplicationProtocolSelector(selector: BiFunction<SSLSocket, MutableList<String>, String>?) {
delegate!!.handshakeApplicationProtocolSelector = selector
}
override fun getHandshakeApplicationProtocolSelector(): BiFunction<SSLSocket, MutableList<String>, String> {
return delegate!!.handshakeApplicationProtocolSelector
}
override fun getHandshakeApplicationProtocolSelector(): BiFunction<SSLSocket, MutableList<String>, String> =
delegate!!.handshakeApplicationProtocolSelector
}

12
okhttp-testing-support/src/main/kotlin/okhttp3/DelegatingSSLSocketFactory.kt
View File

@@ -25,7 +25,9 @@ import javax.net.ssl.SSLSocketFactory
* A [SSLSocketFactory] that delegates calls. Sockets can be configured after creation by
* overriding [.configureSocket].
*/
open class DelegatingSSLSocketFactory(private val delegate: SSLSocketFactory) : SSLSocketFactory() {
open class DelegatingSSLSocketFactory(
private val delegate: SSLSocketFactory,
) : SSLSocketFactory() {
@Throws(IOException::class)
override fun createSocket(): SSLSocket {
val sslSocket = delegate.createSocket() as SSLSocket
@@ -72,13 +74,9 @@ open class DelegatingSSLSocketFactory(private val delegate: SSLSocketFactory) :
return configureSocket(sslSocket)
}
override fun getDefaultCipherSuites(): Array<String> {
return delegate.defaultCipherSuites
}
override fun getDefaultCipherSuites(): Array<String> = delegate.defaultCipherSuites
override fun getSupportedCipherSuites(): Array<String> {
return delegate.supportedCipherSuites
}
override fun getSupportedCipherSuites(): Array<String> = delegate.supportedCipherSuites
@Throws(IOException::class)
override fun createSocket(

4
okhttp-testing-support/src/main/kotlin/okhttp3/DelegatingServerSocketFactory.kt
View File

@@ -24,7 +24,9 @@ import javax.net.ServerSocketFactory
* A [ServerSocketFactory] that delegates calls. Sockets can be configured after creation by
* overriding [.configureServerSocket].
*/
open class DelegatingServerSocketFactory(private val delegate: ServerSocketFactory) : ServerSocketFactory() {
open class DelegatingServerSocketFactory(
private val delegate: ServerSocketFactory,
) : ServerSocketFactory() {
@Throws(IOException::class)
override fun createServerSocket(): ServerSocket {
val serverSocket = delegate.createServerSocket()

4
okhttp-testing-support/src/main/kotlin/okhttp3/DelegatingSocketFactory.kt
View File

@@ -24,7 +24,9 @@ import javax.net.SocketFactory
* A [SocketFactory] that delegates calls. Sockets can be configured after creation by
* overriding [.configureSocket].
*/
open class DelegatingSocketFactory(private val delegate: SocketFactory) : SocketFactory() {
open class DelegatingSocketFactory(
private val delegate: SocketFactory,
) : SocketFactory() {
@Throws(IOException::class)
override fun createSocket(): Socket {
val socket = delegate.createSocket()

4
okhttp-testing-support/src/main/kotlin/okhttp3/FakeDns.kt
View File

@@ -45,9 +45,7 @@ class FakeDns : Dns {
fun lookup(
hostname: String,
index: Int,
): InetAddress {
return hostAddresses[hostname]!![index]
}
): InetAddress = hostAddresses[hostname]!![index]
@Throws(UnknownHostException::class)
override fun lookup(hostname: String): List<InetAddress> {

89
okhttp-testing-support/src/main/kotlin/okhttp3/FakeSSLSession.kt
View File

@@ -23,101 +23,62 @@ import javax.net.ssl.SSLSession
import javax.net.ssl.SSLSessionContext
import javax.security.cert.X509Certificate
class FakeSSLSession(vararg val certificates: Certificate) : SSLSession {
override fun getApplicationBufferSize(): Int {
throw UnsupportedOperationException()
}
class FakeSSLSession(
vararg val certificates: Certificate,
) : SSLSession {
override fun getApplicationBufferSize(): Int = throw UnsupportedOperationException()
override fun getCipherSuite(): String {
throw UnsupportedOperationException()
}
override fun getCipherSuite(): String = throw UnsupportedOperationException()
override fun getCreationTime(): Long {
throw UnsupportedOperationException()
}
override fun getCreationTime(): Long = throw UnsupportedOperationException()
override fun getId(): ByteArray {
throw UnsupportedOperationException()
}
override fun getId(): ByteArray = throw UnsupportedOperationException()
override fun getLastAccessedTime(): Long {
throw UnsupportedOperationException()
}
override fun getLastAccessedTime(): Long = throw UnsupportedOperationException()
override fun getLocalCertificates(): Array<Certificate> {
throw UnsupportedOperationException()
}
override fun getLocalCertificates(): Array<Certificate> = throw UnsupportedOperationException()
override fun getLocalPrincipal(): Principal {
throw UnsupportedOperationException()
}
override fun getLocalPrincipal(): Principal = throw UnsupportedOperationException()
override fun getPacketBufferSize(): Int {
throw UnsupportedOperationException()
}
override fun getPacketBufferSize(): Int = throw UnsupportedOperationException()
@Suppress("UNCHECKED_CAST")
@Throws(SSLPeerUnverifiedException::class)
override fun getPeerCertificates(): Array<Certificate> {
return if (certificates.isEmpty()) {
override fun getPeerCertificates(): Array<Certificate> =
if (certificates.isEmpty()) {
throw SSLPeerUnverifiedException("peer not authenticated")
} else {
certificates as Array<Certificate>
}
}
@Throws(
SSLPeerUnverifiedException::class,
)
override fun getPeerCertificateChain(): Array<X509Certificate> {
throw UnsupportedOperationException()
}
override fun getPeerCertificateChain(): Array<X509Certificate> = throw UnsupportedOperationException()
override fun getPeerHost(): String {
throw UnsupportedOperationException()
}
override fun getPeerHost(): String = throw UnsupportedOperationException()
override fun getPeerPort(): Int {
throw UnsupportedOperationException()
}
override fun getPeerPort(): Int = throw UnsupportedOperationException()
@Throws(SSLPeerUnverifiedException::class)
override fun getPeerPrincipal(): Principal {
throw UnsupportedOperationException()
}
override fun getPeerPrincipal(): Principal = throw UnsupportedOperationException()
override fun getProtocol(): String {
throw UnsupportedOperationException()
}
override fun getProtocol(): String = throw UnsupportedOperationException()
override fun getSessionContext(): SSLSessionContext {
throw UnsupportedOperationException()
}
override fun getSessionContext(): SSLSessionContext = throw UnsupportedOperationException()
override fun putValue(
s: String,
obj: Any,
) {
throw UnsupportedOperationException()
}
): Unit = throw UnsupportedOperationException()
override fun removeValue(s: String) {
throw UnsupportedOperationException()
}
override fun removeValue(s: String): Unit = throw UnsupportedOperationException()
override fun getValue(s: String): Any {
throw UnsupportedOperationException()
}
override fun getValue(s: String): Any = throw UnsupportedOperationException()
override fun getValueNames(): Array<String> {
throw UnsupportedOperationException()
}
override fun getValueNames(): Array<String> = throw UnsupportedOperationException()
override fun invalidate() {
throw UnsupportedOperationException()
}
override fun invalidate(): Unit = throw UnsupportedOperationException()
override fun isValid(): Boolean {
throw UnsupportedOperationException()
}
override fun isValid(): Boolean = throw UnsupportedOperationException()
}

24
okhttp-testing-support/src/main/kotlin/okhttp3/ForwardingRequestBody.kt
View File

@@ -18,34 +18,26 @@ package okhttp3
import java.io.IOException
import okio.BufferedSink
open class ForwardingRequestBody(delegate: RequestBody?) : RequestBody() {
open class ForwardingRequestBody(
delegate: RequestBody?,
) : RequestBody() {
private val delegate: RequestBody
fun delegate(): RequestBody {
return delegate
}
fun delegate(): RequestBody = delegate
override fun contentType(): MediaType? {
return delegate.contentType()
}
override fun contentType(): MediaType? = delegate.contentType()
@Throws(IOException::class)
override fun contentLength(): Long {
return delegate.contentLength()
}
override fun contentLength(): Long = delegate.contentLength()
@Throws(IOException::class)
override fun writeTo(sink: BufferedSink) {
delegate.writeTo(sink)
}
override fun isDuplex(): Boolean {
return delegate.isDuplex()
}
override fun isDuplex(): Boolean = delegate.isDuplex()
override fun toString(): String {
return javaClass.simpleName + "(" + delegate.toString() + ")"
}
override fun toString(): String = javaClass.simpleName + "(" + delegate.toString() + ")"
init {
requireNotNull(delegate) { "delegate == null" }

24
okhttp-testing-support/src/main/kotlin/okhttp3/ForwardingResponseBody.kt
View File

@@ -17,28 +17,20 @@ package okhttp3
import okio.BufferedSource
open class ForwardingResponseBody(delegate: ResponseBody?) : ResponseBody() {
open class ForwardingResponseBody(
delegate: ResponseBody?,
) : ResponseBody() {
private val delegate: ResponseBody
fun delegate(): ResponseBody {
return delegate
}
fun delegate(): ResponseBody = delegate
override fun contentType(): MediaType? {
return delegate.contentType()
}
override fun contentType(): MediaType? = delegate.contentType()
override fun contentLength(): Long {
return delegate.contentLength()
}
override fun contentLength(): Long = delegate.contentLength()
override fun source(): BufferedSource {
return delegate.source()
}
override fun source(): BufferedSource = delegate.source()
override fun toString(): String {
return javaClass.simpleName + "(" + delegate.toString() + ")"
}
override fun toString(): String = javaClass.simpleName + "(" + delegate.toString() + ")"
init {
requireNotNull(delegate) { "delegate == null" }

10
okhttp-testing-support/src/main/kotlin/okhttp3/JsseDebugLogging.kt
View File

@@ -20,7 +20,10 @@ import java.util.logging.Handler
import java.util.logging.LogRecord
object JsseDebugLogging {
data class JsseDebugMessage(val message: String, val param: String?) {
data class JsseDebugMessage(
val message: String,
val param: String?,
) {
enum class Type {
Handshake,
Plaintext,
@@ -47,13 +50,12 @@ object JsseDebugLogging {
else -> Type.Unknown
}
override fun toString(): String {
return if (param != null) {
override fun toString(): String =
if (param != null) {
message + "\n" + param
} else {
message
}
}
}
private fun quietDebug(message: JsseDebugMessage) {

33
okhttp-testing-support/src/main/kotlin/okhttp3/OkHttpClientTestRule.kt
View File

@@ -47,7 +47,9 @@ import org.junit.jupiter.api.extension.ExtensionContext
* Use [newClient] as a factory for a OkHttpClient instances. These instances are specifically
* configured for testing.
*/
class OkHttpClientTestRule : BeforeEachCallback, AfterEachCallback {
class OkHttpClientTestRule :
BeforeEachCallback,
AfterEachCallback {
private val clientEventsList = mutableListOf<String>()
private var testClient: OkHttpClient? = null
private var uncaughtException: Throwable? = null
@@ -160,35 +162,33 @@ class OkHttpClientTestRule : BeforeEachCallback, AfterEachCallback {
val backend = TaskRunner.RealBackend(loomThreadFactory())
val taskRunner = TaskRunner(backend)
OkHttpClient.Builder()
OkHttpClient
.Builder()
.connectionPool(
buildConnectionPool(
connectionListener = connectionListener,
taskRunner = taskRunner,
),
)
.dispatcher(Dispatcher(backend.executor))
).dispatcher(Dispatcher(backend.executor))
.taskRunnerInternal(taskRunner)
} else {
OkHttpClient.Builder()
OkHttpClient
.Builder()
.connectionPool(ConnectionPool(connectionListener = connectionListener))
}
private fun loomThreadFactory(): ThreadFactory {
val ofVirtual = Thread::class.java.getMethod("ofVirtual").invoke(null)
return Class.forName("java.lang.Thread\$Builder")
return Class
.forName("java.lang.Thread\$Builder")
.getMethod("factory")
.invoke(ofVirtual) as ThreadFactory
}
private fun isLoom(): Boolean {
return getPlatformSystemProperty() == LOOM_PROPERTY
}
private fun isLoom(): Boolean = getPlatformSystemProperty() == LOOM_PROPERTY
fun newClientBuilder(): OkHttpClient.Builder {
return newClient().newBuilder()
}
fun newClientBuilder(): OkHttpClient.Builder = newClient().newBuilder()
@Synchronized private fun addEvent(event: String) {
if (recordEvents) {
@@ -302,10 +302,9 @@ class OkHttpClientTestRule : BeforeEachCallback, AfterEachCallback {
}
@SuppressLint("NewApi")
private fun ExtensionContext.isFlaky(): Boolean {
return (testMethod.orElseGet { null }?.isAnnotationPresent(Flaky::class.java) == true) ||
private fun ExtensionContext.isFlaky(): Boolean =
(testMethod.orElseGet { null }?.isAnnotationPresent(Flaky::class.java) == true) ||
(testClass.orElseGet { null }?.isAnnotationPresent(Flaky::class.java) == true)
}
@Synchronized private fun logEvents() {
// Will be ineffective if test overrides the listener
@@ -318,9 +317,7 @@ class OkHttpClientTestRule : BeforeEachCallback, AfterEachCallback {
}
}
fun recordedConnectionEventTypes(): List<String> {
return connectionListener.recordedEventTypes()
}
fun recordedConnectionEventTypes(): List<String> = connectionListener.recordedEventTypes()
companion object {
/**

6
okhttp-testing-support/src/main/kotlin/okhttp3/RecordingConnectionListener.kt
View File

@@ -87,10 +87,10 @@ open class RecordingConnectionListener(
if (elapsedMs != -1L) {
assertThat(
TimeUnit.NANOSECONDS.toMillis(actualElapsedNs)
TimeUnit.NANOSECONDS
.toMillis(actualElapsedNs)
.toDouble(),
)
.isCloseTo(elapsedMs.toDouble(), 100.0)
).isCloseTo(elapsedMs.toDouble(), 100.0)
}
return result

8
okhttp-testing-support/src/main/kotlin/okhttp3/RecordingCookieJar.kt
View File

@@ -28,9 +28,7 @@ class RecordingCookieJar : CookieJar {
requestCookies.add(cookies.toList())
}
fun takeResponseCookies(): List<Cookie> {
return responseCookies.removeFirst()
}
fun takeResponseCookies(): List<Cookie> = responseCookies.removeFirst()
fun assertResponseCookies(vararg cookies: String?) {
assertThat(takeResponseCookies().map(Cookie::toString)).containsExactly(*cookies)
@@ -43,7 +41,5 @@ class RecordingCookieJar : CookieJar {
responseCookies.add(cookies)
}
override fun loadForRequest(url: HttpUrl): List<Cookie> {
return if (requestCookies.isEmpty()) emptyList() else requestCookies.removeFirst()
}
override fun loadForRequest(url: HttpUrl): List<Cookie> = if (requestCookies.isEmpty()) emptyList() else requestCookies.removeFirst()
}

10
okhttp-testing-support/src/main/kotlin/okhttp3/RecordingEventListener.kt
View File

@@ -97,9 +97,7 @@ open class RecordingEventListener(
inline fun <reified T : CallEvent> removeUpToEvent(): T = removeUpToEvent(T::class.java)
inline fun <reified T : CallEvent> findEvent(): T {
return eventSequence.first { it is T } as T
}
inline fun <reified T : CallEvent> findEvent(): T = eventSequence.first { it is T } as T
/**
* Remove and return the next event from the recorded sequence.
@@ -123,10 +121,10 @@ open class RecordingEventListener(
if (elapsedMs != -1L) {
assertThat(
TimeUnit.NANOSECONDS.toMillis(actualElapsedNs)
TimeUnit.NANOSECONDS
.toMillis(actualElapsedNs)
.toDouble(),
)
.isCloseTo(elapsedMs.toDouble(), 100.0)
).isCloseTo(elapsedMs.toDouble(), 100.0)
}
return result

5
okhttp-testing-support/src/main/kotlin/okhttp3/SpecificHostSocketFactory.kt
View File

@@ -37,8 +37,8 @@ class SpecificHostSocketFactory(
hostMapping[requested] = real
}
override fun createSocket(): Socket {
return object : Socket() {
override fun createSocket(): Socket =
object : Socket() {
override fun connect(
endpoint: SocketAddress?,
timeout: Int,
@@ -49,5 +49,4 @@ class SpecificHostSocketFactory(
super.connect(inetSocketAddress, timeout)
}
}
}
}

13
okhttp-testing-support/src/main/kotlin/okhttp3/TestUtilJvm.kt
View File

@@ -36,9 +36,7 @@ object TestUtil {
@JvmStatic val isGraalVmImage = System.getProperty("org.graalvm.nativeimage.imagecode") != null
@JvmStatic
fun headerEntries(vararg elements: String?): List<Header> {
return List(elements.size / 2) { Header(elements[it * 2]!!, elements[it * 2 + 1]!!) }
}
fun headerEntries(vararg elements: String?): List<Header> = List(elements.size / 2) { Header(elements[it * 2]!!, elements[it * 2 + 1]!!) }
@JvmStatic
fun repeat(
@@ -125,15 +123,12 @@ object TestUtil {
}
@JvmStatic
fun threadFactory(name: String): ThreadFactory {
return object : ThreadFactory {
fun threadFactory(name: String): ThreadFactory =
object : ThreadFactory {
private var nextId = 1
override fun newThread(runnable: Runnable): Thread {
return Thread(runnable, "$name-${nextId++}")
}
override fun newThread(runnable: Runnable): Thread = Thread(runnable, "$name-${nextId++}")
}
}
}
fun getEnv(name: String) = System.getenv(name)

25
okhttp-testing-support/src/main/kotlin/okhttp3/TestValueFactory.kt
View File

@@ -102,8 +102,8 @@ class TestValueFactory : Closeable {
taskRunner: TaskRunner = this.taskRunner,
maxIdleConnections: Int = Int.MAX_VALUE,
routePlanner: RoutePlanner? = null,
): RealConnectionPool {
return RealConnectionPool(
): RealConnectionPool =
RealConnectionPool(
taskRunner = taskRunner,
maxIdleConnections = maxIdleConnections,
keepAliveDuration = 100L,
@@ -129,7 +129,6 @@ class TestValueFactory : Closeable {
)
},
)
}
/** Returns an address that's without an SSL socket factory or hostname verifier. */
fun newAddress(
@@ -137,8 +136,8 @@ class TestValueFactory : Closeable {
uriPort: Int = this.uriPort,
proxy: Proxy? = null,
proxySelector: ProxySelector = this.proxySelector,
): Address {
return Address(
): Address =
Address(
uriHost = uriHost,
uriPort = uriPort,
dns = dns,
@@ -152,7 +151,6 @@ class TestValueFactory : Closeable {
connectionSpecs = connectionSpecs,
proxySelector = proxySelector,
)
}
fun newHttpsAddress(
uriHost: String = this.uriHost,
@@ -161,8 +159,8 @@ class TestValueFactory : Closeable {
proxySelector: ProxySelector = this.proxySelector,
sslSocketFactory: SSLSocketFactory? = this.sslSocketFactory,
hostnameVerifier: HostnameVerifier? = this.hostnameVerifier,
): Address {
return Address(
): Address =
Address(
uriHost = uriHost,
uriPort = uriPort,
dns = dns,
@@ -176,22 +174,20 @@ class TestValueFactory : Closeable {
connectionSpecs = connectionSpecs,
proxySelector = proxySelector,
)
}
fun newRoute(
address: Address = newAddress(),
proxy: Proxy = this.proxy,
socketAddress: InetSocketAddress = InetSocketAddress.createUnresolved(uriHost, uriPort),
): Route {
return Route(
): Route =
Route(
address = address,
proxy = proxy,
socketAddress = socketAddress,
)
}
fun newChain(call: RealCall): RealInterceptorChain {
return RealInterceptorChain(
fun newChain(call: RealCall): RealInterceptorChain =
RealInterceptorChain(
call = call,
interceptors = listOf(),
index = 0,
@@ -201,7 +197,6 @@ class TestValueFactory : Closeable {
readTimeoutMillis = 10_000,
writeTimeoutMillis = 10_000,
)
}
fun newRoutePlanner(
client: OkHttpClient,

12
okhttp-testing-support/src/main/kotlin/okhttp3/UppercaseRequestInterceptor.kt
View File

@@ -26,9 +26,7 @@ import okio.buffer
/** Rewrites the request body sent to the server to be all uppercase. */
class UppercaseRequestInterceptor : Interceptor {
@Throws(IOException::class)
override fun intercept(chain: Chain): Response {
return chain.proceed(uppercaseRequest(chain.request()))
}
override fun intercept(chain: Chain): Response = chain.proceed(uppercaseRequest(chain.request()))
/** Returns a request that transforms `request` to be all uppercase. */
private fun uppercaseRequest(request: Request): Request {
@@ -39,13 +37,14 @@ class UppercaseRequestInterceptor : Interceptor {
delegate().writeTo(uppercaseSink(sink).buffer())
}
}
return request.newBuilder()
return request
.newBuilder()
.method(request.method, uppercaseBody)
.build()
}
private fun uppercaseSink(sink: Sink): Sink {
return object : ForwardingSink(sink) {
private fun uppercaseSink(sink: Sink): Sink =
object : ForwardingSink(sink) {
@Throws(IOException::class)
override fun write(
source: Buffer,
@@ -59,5 +58,4 @@ class UppercaseRequestInterceptor : Interceptor {
)
}
}
}
}

11
okhttp-testing-support/src/main/kotlin/okhttp3/UppercaseResponseInterceptor.kt
View File

@@ -25,18 +25,15 @@ import okio.buffer
/** Rewrites the response body returned from the server to be all uppercase. */
class UppercaseResponseInterceptor : Interceptor {
@Throws(IOException::class)
override fun intercept(chain: Chain): Response {
return uppercaseResponse(chain.proceed(chain.request()))
}
override fun intercept(chain: Chain): Response = uppercaseResponse(chain.proceed(chain.request()))
private fun uppercaseResponse(response: Response): Response {
val uppercaseBody: ResponseBody =
object : ForwardingResponseBody(response.body) {
override fun source(): BufferedSource {
return uppercaseSource(delegate().source()).buffer()
}
override fun source(): BufferedSource = uppercaseSource(delegate().source()).buffer()
}
return response.newBuilder()
return response
.newBuilder()
.body(uppercaseBody)
.build()
}

3
okhttp-testing-support/src/main/kotlin/okhttp3/internal/RecordingOkAuthenticator.kt
View File

@@ -46,7 +46,8 @@ class RecordingOkAuthenticator(
407 -> "Proxy-Authorization"
else -> "Authorization"
}
return response.request.newBuilder()
return response.request
.newBuilder()
.addHeader(header, credential)
.build()
}

3
okhttp-testing-support/src/main/kotlin/okhttp3/internal/concurrent/TaskFaker.kt
View File

@@ -349,7 +349,8 @@ class TaskFaker : Closeable {
*/
private inner class TaskFakerBlockingQueue<T>(
val delegate: BlockingQueue<T>,
) : AbstractQueue<T>(), BlockingQueue<T> {
) : AbstractQueue<T>(),
BlockingQueue<T> {
override val size: Int = delegate.size
private var editCount = 0

4
okhttp-testing-support/src/main/kotlin/okhttp3/internal/duplex/AsyncRequestBody.kt
View File

@@ -36,9 +36,7 @@ class AsyncRequestBody : RequestBody() {
override fun isDuplex(): Boolean = true
@Throws(InterruptedException::class)
fun takeSink(): BufferedSink {
return requestBodySinks.poll(5, SECONDS) ?: throw AssertionError("no sink to take")
}
fun takeSink(): BufferedSink = requestBodySinks.poll(5, SECONDS) ?: throw AssertionError("no sink to take")
fun assertNoMoreSinks() {
assertTrue(requestBodySinks.isEmpty())

4
okhttp-testing-support/src/main/kotlin/okhttp3/internal/http2/Http2FlowControlConnectionListener.kt
View File

@@ -21,7 +21,9 @@ import okhttp3.internal.http2.flowcontrol.WindowCounter
/**
* ConnectionListener that outputs CSV for flow control of client receiving streams.
*/
class Http2FlowControlConnectionListener : ConnectionListener(), FlowControlListener {
class Http2FlowControlConnectionListener :
ConnectionListener(),
FlowControlListener {
val start = System.currentTimeMillis()
override fun receivingStreamWindowChanged(

4
okhttp-testing-support/src/main/kotlin/okhttp3/okio/LoggingFilesystem.kt
View File

@@ -21,7 +21,9 @@ import okio.Path
import okio.Sink
import okio.Source
class LoggingFilesystem(fileSystem: FileSystem) : ForwardingFileSystem(fileSystem) {
class LoggingFilesystem(
fileSystem: FileSystem,
) : ForwardingFileSystem(fileSystem) {
fun log(line: String) {
println(line)
}

52
okhttp-testing-support/src/main/kotlin/okhttp3/testing/PlatformRule.kt
View File

@@ -62,7 +62,9 @@ open class PlatformRule
constructor(
val requiredPlatformName: String? = null,
val platform: Platform? = null,
) : BeforeEachCallback, AfterEachCallback, InvocationInterceptor {
) : BeforeEachCallback,
AfterEachCallback,
InvocationInterceptor {
private val versionChecks = mutableListOf<Pair<Matcher<out Any>, Matcher<out Any>>>()
override fun beforeEach(context: ExtensionContext) {
@@ -157,34 +159,26 @@ open class PlatformRule
description.appendText(platform)
}
override fun matches(item: Any?): Boolean {
return getPlatformSystemProperty() == platform
}
override fun matches(item: Any?): Boolean = getPlatformSystemProperty() == platform
}
fun fromMajor(version: Int): Matcher<PlatformVersion> {
return object : TypeSafeMatcher<PlatformVersion>() {
fun fromMajor(version: Int): Matcher<PlatformVersion> =
object : TypeSafeMatcher<PlatformVersion>() {
override fun describeTo(description: Description) {
description.appendText("JDK with version from $version")
}
override fun matchesSafely(item: PlatformVersion): Boolean {
return item.majorVersion >= version
}
override fun matchesSafely(item: PlatformVersion): Boolean = item.majorVersion >= version
}
}
fun onMajor(version: Int): Matcher<PlatformVersion> {
return object : TypeSafeMatcher<PlatformVersion>() {
fun onMajor(version: Int): Matcher<PlatformVersion> =
object : TypeSafeMatcher<PlatformVersion>() {
override fun describeTo(description: Description) {
description.appendText("JDK with version $version")
}
override fun matchesSafely(item: PlatformVersion): Boolean {
return item.majorVersion == version
}
override fun matchesSafely(item: PlatformVersion): Boolean = item.majorVersion == version
}
}
fun rethrowIfNotExpected(e: Throwable) {
versionChecks.forEach { (versionMatcher, failureMatcher) ->
@@ -336,20 +330,18 @@ open class PlatformRule
assumeTrue(PlatformVersion.majorVersion == majorVersion)
}
fun androidSdkVersion(): Int? {
return if (Platform.isAndroid) {
fun androidSdkVersion(): Int? =
if (Platform.isAndroid) {
Build.VERSION.SDK_INT
} else {
null
}
}
fun localhostHandshakeCertificates(): HandshakeCertificates {
return when {
fun localhostHandshakeCertificates(): HandshakeCertificates =
when {
isBouncyCastle() -> localhostHandshakeCertificatesWithRsa2048
else -> localhost()
}
}
val isAndroid: Boolean
get() = Platform.Companion.isAndroid
@@ -373,12 +365,14 @@ open class PlatformRule
*/
private val localhostHandshakeCertificatesWithRsa2048: HandshakeCertificates by lazy {
val heldCertificate =
HeldCertificate.Builder()
HeldCertificate
.Builder()
.commonName("localhost")
.addSubjectAlternativeName("localhost")
.rsa2048()
.build()
return@lazy HandshakeCertificates.Builder()
return@lazy HandshakeCertificates
.Builder()
.heldCertificate(heldCertificate)
.addTrustedCertificate(heldCertificate.certificate)
.build()
@@ -398,7 +392,8 @@ open class PlatformRule
}
val provider =
Conscrypt.newProviderBuilder()
Conscrypt
.newProviderBuilder()
.provideTrustManager(true)
.build()
Security.insertProviderAt(provider, 1)
@@ -499,7 +494,10 @@ open class PlatformRule
}
val isCorrettoInstalled: Boolean =
isCorrettoSupported && Security.getProviders()
.first().name == AmazonCorrettoCryptoProvider.PROVIDER_NAME
isCorrettoSupported &&
Security
.getProviders()
.first()
.name == AmazonCorrettoCryptoProvider.PROVIDER_NAME
}
}

4
okhttp-testing-support/src/main/kotlin/okhttp3/testing/PlatformVersion.kt
View File

@@ -23,7 +23,5 @@ object PlatformVersion {
}
}
fun getJvmSpecVersion(): String {
return System.getProperty("java.specification.version", "unknown")
}
fun getJvmSpecVersion(): String = System.getProperty("java.specification.version", "unknown")
}

4
okhttp-testing-support/src/test/kotlin/okhttp3/OkHttpClientTestRuleTest.kt
View File

@@ -38,9 +38,7 @@ class OkHttpClientTestRuleTest {
val thread =
object : Thread() {
override fun run() {
throw RuntimeException("boom!")
}
override fun run(): Unit = throw RuntimeException("boom!")
}
thread.start()
thread.join()