Skip to content

Commit c51a081

Browse files
committed
Remove docker-engine dependency
1 parent 8d13350 commit c51a081

File tree

12 files changed

+117
-320
lines changed

12 files changed

+117
-320
lines changed

client-groovy4/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ dependencies {
8181
api("de.gesellix:docker-remote-api-client:2025-11-09T15-40-00")
8282
implementation("de.gesellix:docker-filesocket:2025-10-31T17-48-00")
8383
api("de.gesellix:docker-remote-api-model-1-41:2025-10-31T17-49-00")
84-
api("de.gesellix:docker-engine:2025-10-31T18-10-00")
8584
api("de.gesellix:docker-compose:2025-10-31T17-47-00")
8685

8786
implementation(libs.groovy4)

client/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ dependencies {
8181
api("de.gesellix:docker-remote-api-client:2025-11-09T15-40-00")
8282
implementation("de.gesellix:docker-filesocket:2025-10-31T17-48-00")
8383
api("de.gesellix:docker-remote-api-model-1-41:2025-10-31T17-49-00")
84-
api("de.gesellix:docker-engine:2025-10-31T18-10-00")
8584
api("de.gesellix:docker-compose:2025-10-31T17-47-00")
8685

8786
implementation(libs.groovy3)

client/src/main/groovy/de/gesellix/docker/client/container/ArchiveUtil.java

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package de.gesellix.docker.client.container;
22

3-
import de.gesellix.util.IOUtils;
3+
import okio.BufferedSink;
4+
import okio.BufferedSource;
45
import okio.Okio;
5-
import okio.Sink;
6-
import okio.Source;
76
import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
87
import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
98
import org.slf4j.Logger;
@@ -54,26 +53,16 @@ public long copySingleTarEntry(InputStream tarContent, String filename, OutputSt
5453
final byte[] content = new byte[(int) entry.getSize()];
5554
log.debug("going to read {} bytes", content.length);
5655

57-
final Source source = Okio.source(stream);
58-
final Sink sink = Okio.sink(target);
5956
try {
60-
IOUtils.copy(source, sink);
57+
try (BufferedSink sink = Okio.buffer(Okio.sink(target));
58+
BufferedSource source = Okio.buffer(Okio.source(stream))) {
59+
long read = source.readAll(sink);
60+
sink.flush();
61+
// return read;
62+
}
6163
return entry.getSize();
6264
} catch (Exception e) {
6365
throw new RuntimeException("failed to write TarArchiveEntry to target OutputStream", e);
64-
} finally {
65-
silently(() -> {
66-
sink.flush();
67-
return null;
68-
});
69-
silently(() -> {
70-
sink.close();
71-
return null;
72-
});
73-
silently(() -> {
74-
source.close();
75-
return null;
76-
});
7766
}
7867
}
7968

client/src/main/groovy/de/gesellix/docker/client/container/DockerResponseHandler.java

Lines changed: 0 additions & 67 deletions
This file was deleted.

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,12 @@ class ManageContainerClient implements ManageContainer {
4141
private final Logger log = LoggerFactory.getLogger(ManageContainerClient)
4242

4343
private EngineApiClient client
44-
private DockerResponseHandler responseHandler
4544
private QueryParameterEncoder queryParameterEncoder
4645
private ArchiveUtil archiveUtil
4746
private RepositoryTagParser repositoryTagParser
4847

4948
ManageContainerClient(EngineApiClient client) {
5049
this.client = client
51-
this.responseHandler = new DockerResponseHandler()
5250
this.repositoryTagParser = new RepositoryTagParser()
5351
this.queryParameterEncoder = new QueryParameterEncoder()
5452
this.archiveUtil = new ArchiveUtil()
Lines changed: 11 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,85 +1,25 @@
11
package de.gesellix.docker.client;
22

3-
import de.gesellix.docker.engine.EngineResponse;
4-
import de.gesellix.docker.engine.EngineResponseStatus;
3+
public class EngineResponseContent<R> {
54

6-
import java.io.InputStream;
7-
import java.util.concurrent.Future;
8-
9-
public class EngineResponseContent<R> extends EngineResponse<R> {
5+
private R content;
106

117
public EngineResponseContent(R content) {
12-
super();
13-
setContent(content);
14-
}
15-
16-
@Override
17-
public EngineResponseStatus getStatus() {
18-
throw new UnsupportedOperationException("deprecated");
19-
}
20-
21-
@Override
22-
public void setStatus(EngineResponseStatus status) {
23-
throw new UnsupportedOperationException("deprecated");
24-
}
25-
26-
@Override
27-
public Object getHeaders() {
28-
throw new UnsupportedOperationException("deprecated");
29-
}
30-
31-
@Override
32-
public void setHeaders(Object headers) {
33-
throw new UnsupportedOperationException("deprecated");
34-
}
35-
36-
@Override
37-
public String getContentType() {
38-
throw new UnsupportedOperationException("deprecated");
39-
}
40-
41-
@Override
42-
public void setContentType(String contentType) {
43-
throw new UnsupportedOperationException("deprecated");
44-
}
45-
46-
@Override
47-
public String getMimeType() {
48-
throw new UnsupportedOperationException("deprecated");
49-
}
50-
51-
@Override
52-
public void setMimeType(String mimeType) {
53-
throw new UnsupportedOperationException("deprecated");
54-
}
55-
56-
@Override
57-
public String getContentLength() {
58-
throw new UnsupportedOperationException("deprecated");
8+
this.content = content;
599
}
6010

61-
@Override
62-
public void setContentLength(String contentLength) {
63-
throw new UnsupportedOperationException("deprecated");
64-
}
65-
66-
@Override
67-
public InputStream getStream() {
68-
throw new UnsupportedOperationException("deprecated");
11+
public R getContent() {
12+
return content;
6913
}
7014

71-
@Override
72-
public void setStream(InputStream stream) {
73-
throw new UnsupportedOperationException("deprecated");
74-
}
75-
76-
@Override
77-
public Future<?> getTaskFuture() {
78-
throw new UnsupportedOperationException("deprecated");
15+
public void setContent(R content) {
16+
this.content = content;
7917
}
8018

8119
@Override
82-
public void setTaskFuture(Future<?> taskFuture) {
83-
throw new UnsupportedOperationException("deprecated");
20+
public String toString() {
21+
return "EngineResponse{" +
22+
", content=" + content +
23+
'}';
8424
}
8525
}

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

Lines changed: 0 additions & 45 deletions
This file was deleted.

0 commit comments

Comments
 (0)