Remove runtime usage of the legacy OkDockerClient

Author: gesellix

client/src/main/groovy/de/gesellix/docker/client/DockerClientImpl.groovy

@@ -33,8 +33,6 @@ import de.gesellix.docker.client.volume.ManageVolume
 import de.gesellix.docker.client.volume.ManageVolumeClient
 import de.gesellix.docker.engine.DockerClientConfig
 import de.gesellix.docker.engine.DockerEnv
-import de.gesellix.docker.engine.EngineClient
-import de.gesellix.docker.engine.OkDockerClient
 import de.gesellix.docker.remote.api.EngineApiClient
 import de.gesellix.docker.remote.api.EngineApiClientImpl
 import de.gesellix.docker.remote.api.Node
@@ -52,7 +50,6 @@ class DockerClientImpl implements DockerClient {
   Proxy proxy
   DockerClientConfig dockerClientConfig
   DockerEnv env
-  EngineClient httpClient
   EngineApiClient engineApiClient
 
   @Delegate
@@ -107,7 +104,6 @@ class DockerClientImpl implements DockerClient {
 
     AuthConfigReader authConfigReader = new AuthConfigReader(env)
     this.engineApiClient = new EngineApiClientImpl(dockerClientConfig, proxy)
-    this.httpClient = new OkDockerClient(dockerClientConfig, proxy)
     log.info("using docker at '${env.dockerHost}'")
 
     this.repositoryTagParser = new RepositoryTagParser()
@@ -116,7 +112,7 @@ class DockerClientImpl implements DockerClient {
     this.manageAuthentication = new ManageAuthenticationClient(engineApiClient, authConfigReader, env.dockerConfigReader)
     this.manageImage = new ManageImageClient(engineApiClient, manageAuthentication)
     this.manageDistribution = new ManageDistributionService(engineApiClient)
-    this.manageContainer = new ManageContainerClient(engineApiClient, httpClient)
+    this.manageContainer = new ManageContainerClient(engineApiClient)
     this.manageVolume = new ManageVolumeClient(engineApiClient)
     this.manageNetwork = new ManageNetworkClient(engineApiClient)
     this.manageSwarm = new ManageSwarmClient(engineApiClient)

client/src/main/groovy/de/gesellix/docker/client/container/ManageContainerClient.groovy

@@ -3,7 +3,6 @@ package de.gesellix.docker.client.container
 import de.gesellix.docker.client.EngineResponseContent
 import de.gesellix.docker.client.repository.RepositoryAndTag
 import de.gesellix.docker.client.repository.RepositoryTagParser
-import de.gesellix.docker.engine.EngineClient
 import de.gesellix.docker.remote.api.ContainerConfig
 import de.gesellix.docker.remote.api.ContainerCreateRequest
 import de.gesellix.docker.remote.api.ContainerCreateResponse
@@ -42,19 +41,13 @@ class ManageContainerClient implements ManageContainer {
   private final Logger log = LoggerFactory.getLogger(ManageContainerClient)
 
   private EngineApiClient client
-  /**
-   * @deprecated for removal
-   */
-  @Deprecated
-  private EngineClient engineClient
   private DockerResponseHandler responseHandler
   private QueryParameterEncoder queryParameterEncoder
   private ArchiveUtil archiveUtil
   private RepositoryTagParser repositoryTagParser
 
-  ManageContainerClient(EngineApiClient client, EngineClient engineClient) {
+  ManageContainerClient(EngineApiClient client) {
     this.client = client
-    this.engineClient = engineClient
     this.responseHandler = new DockerResponseHandler()
     this.repositoryTagParser = new RepositoryTagParser()
     this.queryParameterEncoder = new QueryParameterEncoder()
@@ -69,27 +62,6 @@ class ManageContainerClient implements ManageContainer {
     client.containerApi.containerAttach(containerId, detachKeys, logs, stream, stdin, stdout, stderr, callback, timeout.toMillis())
   }
 
-  /**
-   * @deprecated use {@link #attachWebsocket(String, String, Boolean, Boolean, Boolean, Boolean, Boolean, WebSocketListener)}
-   * @see #attachWebsocket(String, String, Boolean, Boolean, Boolean, Boolean, Boolean, WebSocketListener)
-   */
-  @Deprecated
-  @Override
-  WebSocket attachWebsocket(String containerId, Map<String, Object> query, WebSocketListener listener) {
-    def oneToTrue = (i) -> {
-      return (i == 1 || i == "1")
-    }
-    return attachWebsocket(containerId,
-        query.getOrDefault("detachKeys", null) as String,
-        oneToTrue(query.getOrDefault("logs", false)),
-        oneToTrue(query.getOrDefault("stream", false)),
-        oneToTrue(query.getOrDefault("stdin", false)),
-        oneToTrue(query.getOrDefault("stdout", false)),
-        oneToTrue(query.getOrDefault("stderr", false)),
-        listener
-    )
-  }
-
   @Override
   WebSocket attachWebsocket(String containerId, String detachKeys,
                             Boolean logs, Boolean stream, Boolean stdin, Boolean stdout, Boolean stderr,

client/src/main/java/de/gesellix/docker/client/container/ManageContainer.java

@@ -37,13 +37,6 @@ void attach(String containerId,
 
   void resizeTTY(String container, Integer height, Integer width);
 
-  /**
-   * @deprecated use {@link #attachWebsocket(String, String, Boolean, Boolean, Boolean, Boolean, Boolean, WebSocketListener)}
-   * @see #attachWebsocket(String, String, Boolean, Boolean, Boolean, Boolean, Boolean, WebSocketListener)
-   */
-  @Deprecated
-  WebSocket attachWebsocket(String container, Map<String, Object> query, WebSocketListener listener);
-
   WebSocket attachWebsocket(String containerId, String detachKeys,
                             Boolean logs, Boolean stream, Boolean stdin, Boolean stdout, Boolean stderr,
                             WebSocketListener listener);

client/src/test/groovy/de/gesellix/docker/client/container/ManageContainerClientTest.groovy

@@ -1,6 +1,5 @@
 package de.gesellix.docker.client.container
 
-import de.gesellix.docker.engine.EngineClient
 import de.gesellix.docker.remote.api.ContainerConfig
 import de.gesellix.docker.remote.api.ContainerCreateRequest
 import de.gesellix.docker.remote.api.ContainerCreateResponse
@@ -30,12 +29,10 @@ class ManageContainerClientTest extends Specification {
 
   ManageContainerClient service
   EngineApiClient client = Mock(EngineApiClient)
-  EngineClient httpClient = Mock(EngineClient)
 
   def setup() {
     service = Spy(ManageContainerClient, constructorArgs: [
-        client,
-        httpClient])
+        client])
   }
 
   def "export container"() {

integration-test/src/test/groovy/de/gesellix/docker/client/DockerClientImplIntegrationSpec.groovy

@@ -122,7 +122,6 @@ class DockerClientImplIntegrationSpec extends Specification {
     def client = new DockerClientImpl(env: new DockerEnv(dockerHost: exampleHost))
 
     then:
-    client.httpClient.dockerClientConfig.env.dockerHost == exampleHost
     client.dockerClientConfig.env.dockerHost == exampleHost
     client.env.dockerHost == exampleHost
   }