chore

Author: gesellix

api-client/src/main/kotlin/de/gesellix/docker/remote/api/client/ContainerApi.kt

@@ -15,7 +15,11 @@ package de.gesellix.docker.remote.api.client
 import com.squareup.moshi.Json
 import com.squareup.moshi.Moshi
 import de.gesellix.docker.engine.DockerClientConfig
-import de.gesellix.docker.engine.RequestMethod.*
+import de.gesellix.docker.engine.RequestMethod.DELETE
+import de.gesellix.docker.engine.RequestMethod.GET
+import de.gesellix.docker.engine.RequestMethod.HEAD
+import de.gesellix.docker.engine.RequestMethod.POST
+import de.gesellix.docker.engine.RequestMethod.PUT
 import de.gesellix.docker.remote.api.ContainerCreateRequest
 import de.gesellix.docker.remote.api.ContainerCreateResponse
 import de.gesellix.docker.remote.api.ContainerInspectResponse
@@ -39,7 +43,6 @@ import de.gesellix.docker.remote.api.core.StreamCallback
 import de.gesellix.docker.remote.api.core.Success
 import de.gesellix.docker.remote.api.core.SuccessStream
 import kotlinx.coroutines.cancel
-import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withTimeout
@@ -217,7 +220,7 @@ class ContainerApi(dockerClientConfig: DockerClientConfig = defaultClientConfig,
           launch {
             withTimeout(timeoutMillis) {
               callback.onStarting(this@launch::cancel)
-              ((localVarResponse as SuccessStream<*>).data as Flow<Frame>).collect { callback.onNext(it) }
+              (localVarResponse as SuccessStream<Frame>).data.collect { callback.onNext(it) }
               callback.onFinished()
             }
           }
@@ -766,7 +769,7 @@ class ContainerApi(dockerClientConfig: DockerClientConfig = defaultClientConfig,
     )
 
     return when (localVarResponse.responseType) {
-      ResponseType.Success -> (localVarResponse as Success<*>).data as List<ContainerSummary>
+      ResponseType.Success -> (localVarResponse as Success<List<ContainerSummary>>).data
       ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
       ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
       ResponseType.ClientError -> {
@@ -859,7 +862,7 @@ class ContainerApi(dockerClientConfig: DockerClientConfig = defaultClientConfig,
           launch {
             withTimeout(timeoutMillis) {
               callback.onStarting(this@launch::cancel)
-              ((localVarResponse as SuccessStream<*>).data as Flow<Frame>).collect { callback.onNext(it) }
+              (localVarResponse as SuccessStream<Frame>).data.collect { callback.onNext(it) }
               callback.onFinished()
             }
           }

api-client/src/main/kotlin/de/gesellix/docker/remote/api/client/ExecApi.kt

@@ -33,8 +33,6 @@ import de.gesellix.docker.remote.api.core.StreamCallback
 import de.gesellix.docker.remote.api.core.Success
 import de.gesellix.docker.remote.api.core.SuccessStream
 import kotlinx.coroutines.cancel
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withTimeoutOrNull
@@ -263,7 +261,7 @@ class ExecApi(dockerClientConfig: DockerClientConfig = defaultClientConfig, prox
           launch {
             withTimeoutOrNull(timeout.toMillis()) {
               actualCallback.onStarting(this@launch::cancel)
-              ((localVarResponse as SuccessStream<*>).data as Flow<Frame>).collect { actualCallback.onNext(it) }
+              (localVarResponse as SuccessStream<Frame>).data.collect { actualCallback.onNext(it) }
               actualCallback.onFinished()
             }
           }

api-client/src/main/kotlin/de/gesellix/docker/remote/api/client/ServiceApi.kt

@@ -35,7 +35,6 @@ import de.gesellix.docker.remote.api.core.StreamCallback
 import de.gesellix.docker.remote.api.core.Success
 import de.gesellix.docker.remote.api.core.SuccessStream
 import kotlinx.coroutines.cancel
-import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withTimeout
@@ -241,7 +240,7 @@ class ServiceApi(dockerClientConfig: DockerClientConfig = defaultClientConfig, p
     )
 
     return when (localVarResponse.responseType) {
-      ResponseType.Success -> (localVarResponse as Success<*>).data as List<Service>
+      ResponseType.Success -> (localVarResponse as Success<List<Service>>).data
       ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
       ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
       ResponseType.ClientError -> {
@@ -325,7 +324,7 @@ class ServiceApi(dockerClientConfig: DockerClientConfig = defaultClientConfig, p
           launch {
             withTimeout(timeoutMillis) {
               callback.onStarting(this@launch::cancel)
-              ((localVarResponse as SuccessStream<*>).data as Flow<Frame>).collect { callback.onNext(it) }
+              (localVarResponse as SuccessStream<Frame>).data.collect { callback.onNext(it) }
               callback.onFinished()
             }
           }

api-client/src/main/kotlin/de/gesellix/docker/remote/api/client/TaskApi.kt

@@ -28,7 +28,6 @@ import de.gesellix.docker.remote.api.core.StreamCallback
 import de.gesellix.docker.remote.api.core.Success
 import de.gesellix.docker.remote.api.core.SuccessStream
 import kotlinx.coroutines.cancel
-import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withTimeout
@@ -115,7 +114,7 @@ class TaskApi(dockerClientConfig: DockerClientConfig = defaultClientConfig, prox
     )
 
     return when (localVarResponse.responseType) {
-      ResponseType.Success -> (localVarResponse as Success<*>).data as List<Task>
+      ResponseType.Success -> (localVarResponse as Success<List<Task>>).data
       ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
       ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
       ResponseType.ClientError -> {
@@ -195,7 +194,7 @@ class TaskApi(dockerClientConfig: DockerClientConfig = defaultClientConfig, prox
           launch {
             withTimeout(timeoutMillis) {
               callback.onStarting(this@launch::cancel)
-              ((localVarResponse as SuccessStream<*>).data as Flow<Frame>).collect { callback.onNext(it) }
+              (localVarResponse as SuccessStream<Frame>).data.collect { callback.onNext(it) }
               callback.onFinished()
             }
           }

api-client/src/main/kotlin/de/gesellix/docker/remote/api/core/ApiClient.kt

@@ -44,7 +44,14 @@ open class ApiClient(
     protected const val TextPlainMediaType = "text/plain"
     protected const val JsonMediaType = "application/json"
     protected const val OctetStreamMediaType = "application/octet-stream"
-    protected const val DockerRawStreamMediaType = "application/vnd.docker.raw-stream"
+    // see https://docs.docker.com/engine/api/version-history/#v142-api-changes
+    // see https://github.com/moby/moby/pull/39812
+    // raw-stream: with attached Tty
+    const val DockerRawStreamMediaType = "application/vnd.docker.raw-stream"
+    // see https://docs.docker.com/engine/api/version-history/#v142-api-changes
+    // see https://github.com/moby/moby/pull/39812
+    // multiplexed-stream: without attached Tty
+    const val DockerMultiplexedStreamMediaType = "application/vnd.docker.multiplexed-stream"
 
     //    val apiKey: MutableMap<String, String> = mutableMapOf()
 //    val apiKeyPrefix: MutableMap<String, String> = mutableMapOf()
@@ -254,13 +261,13 @@ open class ApiClient(
       )
       response.isClientError -> return ClientError(
         response.message,
-        response.body?.string(),
+        response.body.string(),
         response.code,
         response.headers.toMultimap()
       )
       else -> return ServerError(
         response.message,
-        response.body?.string(),
+        response.body.string(),
         response.code,
         response.headers.toMultimap()
       )
@@ -289,13 +296,13 @@ open class ApiClient(
       )
       response.isClientError -> return ClientError(
         response.message,
-        response.body?.string(),
+        response.body.string(),
         response.code,
         response.headers.toMultimap()
       )
       else -> return ServerError(
         response.message,
-        response.body?.string(),
+        response.body.string(),
         response.code,
         response.headers.toMultimap()
       )
@@ -324,13 +331,13 @@ open class ApiClient(
       )
       response.isClientError -> return ClientError(
         response.message,
-        response.body?.string(),
+        response.body.string(),
         response.code,
         response.headers.toMultimap()
       )
       else -> return ServerError(
         response.message,
-        response.body?.string(),
+        response.body.string(),
         response.code,
         response.headers.toMultimap()
       )

api-client/src/main/kotlin/de/gesellix/docker/remote/api/core/EnforceResponseContentTypeInterceptor.kt

@@ -7,7 +7,9 @@ import java.net.HttpURLConnection.HTTP_NO_CONTENT
 data class EnforceResponseContentTypeConfig(val fallbackContentType: String = "")
 
 // This one would work automatically, when the response content-type would be set correctly :-/
-// - for /attach, /logs and similar endpoints see https://github.com/gesellix/docker-client/issues/21
+// see https://github.com/gesellix/docker-client/issues/21
+// see https://github.com/moby/moby/pull/39812
+// - for /attach, /logs and similar endpoints the issue has been fixed with api version 1.42
 // - for /stats see (?)
 class EnforceResponseContentTypeInterceptor : Interceptor {
 

api-client/src/main/kotlin/de/gesellix/docker/remote/api/core/ResponseConsumer.kt

@@ -62,10 +62,10 @@ fun ResponseBody?.consumeFrames(mediaType: String?, expectMultiplexedResponse: B
     return emptyFlow()
   }
   when (mediaType) {
-    // TODO since api v1.42 we should be able to use the media-type instead of the 'expectMultiplexedResponse' flag
-    // see https://docs.docker.com/engine/api/version-history/#v142-api-changes
-    "application/vnd.docker.multiplexed-stream",
-    "application/vnd.docker.raw-stream" -> {
+    // multiplexed-stream: without attached Tty
+    ApiClient.Companion.DockerMultiplexedStreamMediaType,
+      // raw-stream: with attached Tty
+    ApiClient.Companion.DockerRawStreamMediaType -> {
       val reader = FrameReader(source(), expectMultiplexedResponse)
       val events = flow {
         while (reader.hasNext()) {

api-client/src/test/java/de/gesellix/docker/remote/api/client/ContainerApiIntegrationTest.java

@@ -795,7 +795,9 @@ public void containerAttachNonInteractive() {
     new Timer().schedule(new TimerTask() {
       @Override
       public void run() {
-        callback.job.cancel();
+        if (callback.job != null) {
+          callback.job.cancel();
+        }
         wait.countDown();
       }
     }, 5000);

api-client/src/test/java/de/gesellix/docker/remote/api/client/SystemApiIntegrationTest.java

@@ -141,7 +141,7 @@ public void systemPingHead() {
   @Test
   public void systemVersion() {
     SystemVersion systemVersion = systemApi.systemVersion();
-    assertTrue(asList("1.42", "1.43", "1.44", "1.45", "1.46", "1.47", "1.48").contains(systemVersion.getApiVersion()));
+    assertTrue(asList("1.42", "1.43", "1.44", "1.45", "1.46", "1.47", "1.48", "1.49", "1.50", "1.51").contains(systemVersion.getApiVersion()));
   }
 
   static class SystemEventsCallback implements StreamCallback<EventMessage> {

api-client/src/test/java/de/gesellix/docker/remote/api/testutil/TestImage.java

@@ -16,7 +16,7 @@ public TestImage(EngineApiClient engineApiClient) {
 
     this.useWindowsContainer = Objects.requireNonNull(engineApiClient.getSystemApi().systemVersion().getOs()).equalsIgnoreCase("windows");
     this.repository = "gesellix/echo-server";
-    this.tag = "2024-12-22T16-35-00";
+    this.tag = "2025-07-27T22-12-00";
 
     // TODO consider NOT calling prepare inside the constructor
     prepare();